[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#28957: marked as done (ipautofw cleanup (PATCH))



Your message dated Sun, 31 Jul 2005 23:34:14 +0100
with message-id <20050731223414.GA30932@deprecation.cyrius.com>
and subject line Removed from Debian - unmaintained
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--------------------------------------
Received: (at submit) by bugs.debian.org; 4 Nov 1998 20:55:45 +0000
Received: (qmail 7666 invoked from network); 4 Nov 1998 20:54:36 -0000
Received: from song.medialab.sonera.net (195.156.109.170)
  by master.debian.org with SMTP; 4 Nov 1998 20:54:36 -0000
Received: (from tom@localhost)
	by song.medialab.sonera.net (8.9.1a/8.9.1/Debian/GNU) id WAA00960;
	Wed, 4 Nov 1998 22:54:30 +0200
Date: Wed, 4 Nov 1998 22:54:30 +0200
Message-Id: <199811042054.WAA00960@song.medialab.sonera.net>
From: Topi Miettinen <tom@medialab.sonera.net>
Subject: ipautofw cleanup (PATCH)
To: submit@bugs.debian.org
X-Mailer: bug 3.1.7

Package: netbase
Version: 3.11-1

This patch changes ipautofw error output to stderr. Also if the last
socket and setsockopt calls fail, exit(1).

BTW: There's a new upstream version available, but no functionality
has changed.

-Topi

diff -ru netbase-3.11/ipautofw-960628/ipautofw-2.0.0.c.orig netbase-3.11/ipautofw-960628/ipautofw-2.0.0.c
--- netbase-3.11/ipautofw-960628/ipautofw-2.0.0.c.orig	Sun Nov  1 22:03:10 1998
+++ netbase-3.11/ipautofw-960628/ipautofw-2.0.0.c	Wed Nov  4 22:30:01 1998
@@ -65,32 +65,32 @@
 	af.next=NULL;
 	if (argc<2)
 	{
-		printf("Usage:\n");
-		printf("    ipautofw <command> <options>\n\n");
-		printf("Valid commands:\n");
-		printf("    -A                           add new autoforward entry\n");
-		printf("    -D                           delete an autoforward entry\n");
-		printf("    -F                           flush the autoforward table\n");
-		printf("\nValid options:\n");
-		printf("    -r <type> <low> <high>       forwarding on ports <low> to <high> using\n");
-		printf("                                 protocol <type> (tcp or udp)\n\n");
-		printf("    -h <host>                    IP address of host to receive forwarded\n");
-		printf("                                 packets\n\n");
-		printf("    -d <type> <low> <high>       specifies a set of ports which will not use\n");
-		printf("                                 the default high range (60000+) masquerade\n");
-		printf("                                 port area\n\n");
-		printf("    -p <type> <visible> <host>:<hidden>\n");
-		printf("                                 set up port bouncing from visible host port\n");
-		printf("                                 to masqueraded host <host> on port <hidden>,\n");
-		printf("                                 protocol <type> (currently not supported)\n\n");
-		printf("    -c <type> <port>             specifies a control port and protocol\n\n");
-		printf("    -u                           Do _not_ require that a host connect within\n");
-		printf("                                 15 seconds of triggering the control port\n\n");
-		printf("    -i                           Insecure mode; any host many connect after\n");
-		printf("                                 implied by not using the -c option or implied\n");
-		printf("                                 by using the -h option\n");
-		printf("                                 once the control port has been triggered\n");
-		printf("    -v                           Verbose mode\n\n");
+		fprintf(stderr, "Usage:\n");
+		fprintf(stderr, "    ipautofw <command> <options>\n\n");
+		fprintf(stderr, "Valid commands:\n");
+		fprintf(stderr, "    -A                           add new autoforward entry\n");
+		fprintf(stderr, "    -D                           delete an autoforward entry\n");
+		fprintf(stderr, "    -F                           flush the autoforward table\n");
+		fprintf(stderr, "\nValid options:\n");
+		fprintf(stderr, "    -r <type> <low> <high>       forwarding on ports <low> to <high> using\n");
+		fprintf(stderr, "                                 protocol <type> (tcp or udp)\n\n");
+		fprintf(stderr, "    -h <host>                    IP address of host to receive forwarded\n");
+		fprintf(stderr, "                                 packets\n\n");
+		fprintf(stderr, "    -d <type> <low> <high>       specifies a set of ports which will not use\n");
+		fprintf(stderr, "                                 the default high range (60000+) masquerade\n");
+		fprintf(stderr, "                                 port area\n\n");
+		fprintf(stderr, "    -p <type> <visible> <host>:<hidden>\n");
+		fprintf(stderr, "                                 set up port bouncing from visible host port\n");
+		fprintf(stderr, "                                 to masqueraded host <host> on port <hidden>,\n");
+		fprintf(stderr, "                                 protocol <type> (currently not supported)\n\n");
+		fprintf(stderr, "    -c <type> <port>             specifies a control port and protocol\n\n");
+		fprintf(stderr, "    -u                           Do _not_ require that a host connect within\n");
+		fprintf(stderr, "                                 15 seconds of triggering the control port\n\n");
+		fprintf(stderr, "    -i                           Insecure mode; any host many connect after\n");
+		fprintf(stderr, "                                 implied by not using the -c option or implied\n");
+		fprintf(stderr, "                                 by using the -h option\n");
+		fprintf(stderr, "                                 once the control port has been triggered\n");
+		fprintf(stderr, "    -v                           Verbose mode\n\n");
 		exit(1);
 	}
 	switch(argv[1][1])
@@ -105,12 +105,12 @@
 			command=IP_AUTOFW_FLUSH;
 			break;
 		default:
-			printf("Command must be either -A, -D, or -F\n");
+			fprintf(stderr, "Command must be either -A, -D, or -F\n");
 			exit(1);
 	}
 	if (argc>2 && command==IP_AUTOFW_FLUSH)
 	{
-		printf("The flush command does not take options\n");
+		fprintf(stderr, "The flush command does not take options\n");
 		exit(1);
 	}
 	
@@ -124,7 +124,7 @@
 					tmp=argv[index+1];
 					if (*tmp!='t' && *tmp!='u')
 					{
-						printf("protocol must be either tcp or udp\n");
+						fprintf(stderr, "protocol must be either tcp or udp\n");
 						exit(1);
 					}
 					if (*tmp=='t')
@@ -135,13 +135,13 @@
 					sscanf(argv[index+3],"%hu",&af.high);
 					if (af.low==0 || af.high==0 || af.high<af.low)
 					{
-						printf("Illegal port numbers\n");
+						fprintf(stderr, "Illegal port numbers\n");
 						exit(1);
 					}
 					index+=3;
 					if (af.type)
 					{
-						printf("-r cannot be used in conjunction with -p or -d\n");
+						fprintf(stderr, "-r cannot be used in conjunction with -p or -d\n");
 						exit(1);
 					}
 					af.type=IP_FWD_RANGE;
@@ -150,7 +150,7 @@
 					tmp=argv[index+1];
 					if (*tmp!='t' && *tmp!='u')
 					{
-						printf("protocol must be either tcp or udp\n");
+						fprintf(stderr, "protocol must be either tcp or udp\n");
 						exit(1);
 					}
 					if (*tmp=='t')
@@ -161,13 +161,13 @@
 					sscanf(argv[index+3],"%hu",&af.high);
 					if (af.low==0 || af.high==0 || af.high<af.low)
 					{
-						printf("Illegal port numbers\n");
+						fprintf(stderr, "Illegal port numbers\n");
 						exit(1);
 					}
 					index+=3;
 					if (af.type)
 					{
-						printf("-d cannot be used in conjunction with -p or -r\n");
+						fprintf(stderr, "-d cannot be used in conjunction with -p or -r\n");
 						exit(1);
 					}
 					af.type=IP_FWD_DIRECT;
@@ -175,7 +175,7 @@
 				case 'h':
 					if (sscanf(argv[index+1],"%hd.%hd.%hd.%hd",&b1,&b2,&b3,&b4)<0)
 					{
-						printf("Invalid IP address: %s\n",argv[index+1]);
+						fprintf(stderr, "Invalid IP address: %s\n",argv[index+1]);
 						exit(1);
 					}
 					af.where=b1+b2*256+b3*256*256+b4*256*256*256;
@@ -186,7 +186,7 @@
 					tmp=argv[index+1];
 					if (*tmp!='t' && *tmp!='u')
 					{
-						printf("protocol must be either tcp or udp\n");
+						fprintf(stderr, "protocol must be either tcp or udp\n");
 						exit(1);
 					}
 					if (*tmp=='t')
@@ -198,13 +198,13 @@
 					af.where=b1+b2*256+b3*256*256+b4*256*256*256;
 					if (af.visible==0 || af.hidden==0)
 					{
-						printf("Illegal port numbers\n");
+						fprintf(stderr, "Illegal port numbers\n");
 						exit(1);
 					}
 					index+=3;
 					if (af.type)
 					{
-						printf("-p cannot be used in conjunction with -r or -d\n");
+						fprintf(stderr, "-p cannot be used in conjunction with -r or -d\n");
 						exit(1);
 					}
 					af.type=IP_FWD_PORT;
@@ -213,7 +213,7 @@
 					tmp=argv[index+1];
 					if (*tmp!='t' && *tmp!='u')
 					{
-						printf("Control protocol must be either tcp or udp\n");
+						fprintf(stderr, "Control protocol must be either tcp or udp\n");
 						exit(1);
 					}
 					if (*tmp=='t')
@@ -233,18 +233,18 @@
 					verbose=1;
 					break;
 				default:
-					printf("Invalid option: %s\n",argv[index]);
+					fprintf(stderr, "Invalid option: %s\n",argv[index]);
 					exit(1);
 			}
 		}
 		else
 		{
-			printf("Invalid option: %s\n",argv[index]);
+			fprintf(stderr, "Invalid option: %s\n",argv[index]);
 		}
 	}
 	if (af.where && (af.flags & IP_AUTOFW_SECURE) && af.type!=IP_FWD_PORT)
 	{
-		printf("Cannot use -h in secure mode\n");
+		fprintf(stderr, "Cannot use -h in secure mode\n");
 	}
 	if (!(af.ctlport && af.ctlproto))
 	{
@@ -252,11 +252,11 @@
 	}
 	if (af.ctlport && af.ctlproto && !(af.flags & IP_AUTOFW_SECURE))
 	{
-		printf("-i cannot be specified with a control port\n");
+		fprintf(stderr, "-i cannot be specified with a control port\n");
 	}
 	if (!af.type && command!=IP_AUTOFW_FLUSH)
 	{
-		printf("You must select a type of forwarding (direct, port, or range)\n");
+		fprintf(stderr, "You must select a type of forwarding (direct, port, or range)\n");
 		exit(1);
 	}
 	if (verbose)
@@ -267,7 +267,7 @@
 				printf("Adding autofwd ");
 				break;
 			case IP_AUTOFW_DEL:
-				printf("Deleteing autofwd ");
+				printf("Deleting autofwd ");
 				break;
 			case IP_AUTOFW_FLUSH:
 				printf("Flushing autoforward table\n");
@@ -296,7 +296,14 @@
 		printf("\n");
 	}
 	socket_fd=socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
-	if (setsockopt(socket_fd, IPPROTO_IP, command, &af, sizeof(af))<0)
+	if (socket_fd < 0) {
+		perror("socket");
+		exit(1);
+	}
+
+	if (setsockopt(socket_fd, IPPROTO_IP, command, &af, sizeof(af))<0) {
 		perror("setsockopt");
+		exit(1);
+	}
 	exit(0);
 }
---------------------------------------
Received: (at 28957-done) by bugs.debian.org; 31 Jul 2005 22:34:29 +0000
>From tbm@cyrius.com Sun Jul 31 15:34:29 2005
Return-path: <tbm@cyrius.com>
Received: from sorrow.cyrius.com [65.19.161.204] 
	by spohr.debian.org with esmtp (Exim 3.36 1 (Debian))
	id 1DzMO4-0008VG-00; Sun, 31 Jul 2005 15:34:29 -0700
Received: by sorrow.cyrius.com (Postfix, from userid 10)
	id 9F3BC64D55; Sun, 31 Jul 2005 22:34:23 +0000 (UTC)
Received: by deprecation.cyrius.com (Postfix, from userid 1000)
	id 026B685FC; Sun, 31 Jul 2005 23:34:14 +0100 (BST)
Date: Sun, 31 Jul 2005 23:34:14 +0100
From: Martin Michlmayr <tbm@cyrius.com>
To: 28957-done@bugs.debian.org, 31379-done@bugs.debian.org
Subject: Removed from Debian - unmaintained
Message-ID: <20050731223414.GA30932@deprecation.cyrius.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.9i
Delivered-To: 28957-done@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Level: 
X-Spam-Status: No, hits=-3.0 required=4.0 tests=BAYES_00 autolearn=no 
	version=2.60-bugs.debian.org_2005_01_02
X-CrossAssassin-Score: 107

This package has now been removed from Debian because nobody was
interested in maintaining it; see
http://lists.debian.org/debian-devel-announce/2005/06/msg00014.html
for more information.

-- 
Martin Michlmayr
http://www.cyrius.com/



Reply to: