Mailing List Archive

Author: Antonio Borneo
Date: Sat Jan 14 08:57:51 2012
New Revision: 511

Log:
typos and unused variables

Author: Florian Schlichting <fschlich@zedat.fu-berlin.de>

while packaging a current SVN snapshot for Debian, our qa tools called
my attention to a few typos and unused variables, and I'd like to share
the patches.

Modified:
branches/vpnc-nortel/config.c
branches/vpnc-nortel/enum2debug.pl
branches/vpnc-nortel/isakmp-pkt.c
branches/vpnc-nortel/tunip.c
branches/vpnc-nortel/vpnc.8.template
trunk/config.c
trunk/enum2debug.pl
trunk/isakmp-pkt.c
trunk/tunip.c
trunk/vpnc.8.template

Modified: branches/vpnc-nortel/config.c
==============================================================================
--- branches/vpnc-nortel/config.c (original)
+++ branches/vpnc-nortel/config.c Sat Jan 14 08:57:51 2012
@@ -323,7 +323,7 @@
"Script ",
"<command>",
"command is executed using system() to configure the interface,\n"
- "routing and so on. Device name, IP, etc. are passed using enviroment\n"
+ "routing and so on. Device name, IP, etc. are passed using environment\n"
"variables, see README. This script is executed right after ISAKMP is\n"
"done, but before tunneling is enabled. It is called when vpnc\n"
"terminates, too\n",

Modified: branches/vpnc-nortel/enum2debug.pl
==============================================================================
--- branches/vpnc-nortel/enum2debug.pl (original)
+++ branches/vpnc-nortel/enum2debug.pl Sat Jan 14 08:57:51 2012
@@ -6,8 +6,6 @@
use warnings;

my $in_enum = 0;
-my $element;
-my $arrayname;

print STDERR << 'EOF';
/* Automatically generated with enum2debug.pl: Don't edit! */

Modified: branches/vpnc-nortel/isakmp-pkt.c
==============================================================================
--- branches/vpnc-nortel/isakmp-pkt.c (original)
+++ branches/vpnc-nortel/isakmp-pkt.c Sat Jan 14 08:57:51 2012
@@ -929,7 +929,7 @@
}

DEBUG(3, printf("BEGIN_PARSE\n"));
- DEBUG(3, printf("Recieved Packet Len: %zu\n", data_len));
+ DEBUG(3, printf("Received Packet Len: %zu\n", data_len));
fetchn(r->i_cookie, ISAKMP_COOKIE_LENGTH);
hex_dump("i_cookie", r->i_cookie, ISAKMP_COOKIE_LENGTH, NULL);
fetchn(r->r_cookie, ISAKMP_COOKIE_LENGTH);

Modified: branches/vpnc-nortel/tunip.c
==============================================================================
--- branches/vpnc-nortel/tunip.c (original)
+++ branches/vpnc-nortel/tunip.c Sat Jan 14 08:57:51 2012
@@ -649,11 +649,9 @@
* Process non-IP packets
* Return 1 if packet has been processed, 0 otherwise
*/
-static int process_non_ip(struct sa_block *s, uint8_t *frame)
+static int process_non_ip(uint8_t *frame)
{
struct ether_header *eth = (struct ether_header *) frame;
-
- s = NULL; /* unused */

if (ntohs(eth->ether_type) != ETHERTYPE_IP) {
/* drop non-ip traffic */
@@ -684,7 +682,7 @@
if (process_arp(s, start)) {
return;
}
- if (process_non_ip(s, start)) {
+ if (process_non_ip(start)) {
return;
}
pack -= ETH_HLEN;

Modified: branches/vpnc-nortel/vpnc.8.template
==============================================================================
--- branches/vpnc-nortel/vpnc.8.template (original)
+++ branches/vpnc-nortel/vpnc.8.template Sat Jan 14 08:57:51 2012
@@ -176,7 +176,7 @@
make sure that files with colliding hashes have different names. The number
can be derived from the certificate file itself:
.P
-openssl x509 -subject_hash -noout -in /etc/vpnc/vpn-example-com.pem
+openssl x509 \-subject_hash \-noout \-in /etc/vpnc/vpn\-example\-com.pem

See also the
.B \-\-print\-config
@@ -207,7 +207,7 @@
License can be found in /usr/share/common\-licenses/GPL.
.SH "SEE ALSO"
.BR pcf2vpnc (1),
-.BR cisco-decrypt (1),
+.BR cisco\-decrypt (1),
.BR ip (8),
.BR ifconfig (8),
.BR route (1),

Modified: trunk/config.c
==============================================================================
--- trunk/config.c (original)
+++ trunk/config.c Sat Jan 14 08:57:51 2012
@@ -309,7 +309,7 @@
"Script ",
"<command>",
"command is executed using system() to configure the interface,\n"
- "routing and so on. Device name, IP, etc. are passed using enviroment\n"
+ "routing and so on. Device name, IP, etc. are passed using environment\n"
"variables, see README. This script is executed right after ISAKMP is\n"
"done, but before tunneling is enabled. It is called when vpnc\n"
"terminates, too\n",

Modified: trunk/enum2debug.pl
==============================================================================
--- trunk/enum2debug.pl (original)
+++ trunk/enum2debug.pl Sat Jan 14 08:57:51 2012
@@ -6,8 +6,6 @@
use warnings;

my $in_enum = 0;
-my $element;
-my $arrayname;

print STDERR << 'EOF';
/* Automatically generated with enum2debug.pl: Don't edit! */

Modified: trunk/isakmp-pkt.c
==============================================================================
--- trunk/isakmp-pkt.c (original)
+++ trunk/isakmp-pkt.c Sat Jan 14 08:57:51 2012
@@ -816,7 +816,7 @@
}

DEBUG(3, printf("BEGIN_PARSE\n"));
- DEBUG(3, printf("Recieved Packet Len: %zu\n", data_len));
+ DEBUG(3, printf("Received Packet Len: %zu\n", data_len));
fetchn(r->i_cookie, ISAKMP_COOKIE_LENGTH);
hex_dump("i_cookie", r->i_cookie, ISAKMP_COOKIE_LENGTH, NULL);
fetchn(r->r_cookie, ISAKMP_COOKIE_LENGTH);

Modified: trunk/tunip.c
==============================================================================
--- trunk/tunip.c (original)
+++ trunk/tunip.c Sat Jan 14 08:57:51 2012
@@ -649,11 +649,9 @@
* Process non-IP packets
* Return 1 if packet has been processed, 0 otherwise
*/
-static int process_non_ip(struct sa_block *s, uint8_t *frame)
+static int process_non_ip(uint8_t *frame)
{
struct ether_header *eth = (struct ether_header *) frame;
-
- s = NULL; /* unused */

if (ntohs(eth->ether_type) != ETHERTYPE_IP) {
/* drop non-ip traffic */
@@ -684,7 +682,7 @@
if (process_arp(s, start)) {
return;
}
- if (process_non_ip(s, start)) {
+ if (process_non_ip(start)) {
return;
}
pack -= ETH_HLEN;

Modified: trunk/vpnc.8.template
==============================================================================
--- trunk/vpnc.8.template (original)
+++ trunk/vpnc.8.template Sat Jan 14 08:57:51 2012
@@ -176,7 +176,7 @@
make sure that files with colliding hashes have different names. The number
can be derived from the certificate file itself:
.P
-openssl x509 -subject_hash -noout -in /etc/vpnc/vpn-example-com.pem
+openssl x509 \-subject_hash \-noout \-in /etc/vpnc/vpn\-example\-com.pem

See also the
.B \-\-print\-config
@@ -207,7 +207,7 @@
License can be found in /usr/share/common\-licenses/GPL.
.SH "SEE ALSO"
.BR pcf2vpnc (1),
-.BR cisco-decrypt (1),
+.BR cisco\-decrypt (1),
.BR ip (8),
.BR ifconfig (8),
.BR route (1),

_______________________________________________
vpnc-devel mailing list
vpnc-devel@unix-ag.uni-kl.de
https://lists.unix-ag.uni-kl.de/mailman/listinfo/vpnc-devel
http://www.unix-ag.uni-kl.de/~massar/vpnc/