Date: Sat, 4 Apr 2009 14:41:31 +1000 (YAKST) From: Alexander Logvinov <ports@logvinov.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: matt@efs.org Subject: ports/133358: [PATCH] net/bounce: add new -q option Message-ID: <200904040441.n344fVGs053657@blg.akavia.ru> Resent-Message-ID: <200904040450.n344o1Wn039406@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 133358 >Category: ports >Synopsis: [PATCH] net/bounce: add new -q option >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Apr 04 04:50:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Alexander Logvinov >Release: FreeBSD 6.4-RELEASE i386 >Organization: >Environment: >Description: Add new -q option to avoid spamming to syslog. >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/net/bounce/Makefile,v retrieving revision 1.25 diff -u -r1.25 Makefile --- Makefile 2 Sep 2008 19:05:12 -0000 1.25 +++ Makefile 4 Apr 2009 04:32:48 -0000 @@ -7,7 +7,7 @@ PORTNAME= bounce PORTVERSION= 1.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net security MASTER_SITES= http://www.iagora.com/~espel/ \ ${MASTER_SITE_LOCAL} Index: files/patch-bounce.c =================================================================== RCS file: /home/pcvs/ports/net/bounce/files/patch-bounce.c,v retrieving revision 1.1 diff -u -r1.1 patch-bounce.c --- files/patch-bounce.c 2 Sep 2008 19:05:13 -0000 1.1 +++ files/patch-bounce.c 4 Apr 2009 04:32:48 -0000 @@ -1,5 +1,5 @@ ---- bounce.c.old 2008-09-02 14:10:20.000000000 -0300 -+++ bounce.c 2008-09-02 14:10:29.000000000 -0300 +--- bounce.c.orig 2009-03-08 23:05:57.000000000 +0900 ++++ bounce.c 2009-03-08 23:07:09.000000000 +0900 @@ -1,5 +1,7 @@ /* socket bouncer, by orabidoo 12 Feb '95 using code from mark@cairo.anu.edu.au's general purpose telnet server. @@ -44,12 +44,12 @@ chead=ctail=cbuf; cpos=0; -@@ -134,31 +142,65 @@ +@@ -134,31 +142,66 @@ } int main(int argc,char *argv[]) { - int srv_fd, rem_fd, len, cl_fd, on=1; -+ int srv_fd, rem_fd, len, cl_fd, on=1, b=0, d=0; ++ int srv_fd, rem_fd, len, cl_fd, on=1, b=0, d=0, q=0; int myport=DEFAULT_PORT, remoteport; - struct sockaddr_in rem_addr, srv_addr, cl_addr; + struct sockaddr_in rem_addr, srv_addr, cl_addr, src_addr; @@ -78,7 +78,7 @@ + + /* Process arguments */ + -+ while( (ch = getopt(argc, argv, "p:a:b:dt:")) != -1 ) { ++ while( (ch = getopt(argc, argv, "p:a:b:dqt:")) != -1 ) { + switch(ch) { + case 'b': b = 1; + sourcename = malloc( strlen(optarg) + 1); @@ -98,6 +98,7 @@ + break; + + case 'd': d = 1; break; ++ case 'q': q = 1; break; + case 'p': + if ((myport=atoi(optarg))==0) { + fprintf(stderr,"Bad port number.\n"); @@ -119,7 +120,7 @@ + argv += optind; + + if (argc!=2) { -+ fprintf(stderr,"Use: %s [-a localaddr | -b localaddr] [-d] [-p localport] [-t timer] machine port \n",myname); ++ fprintf(stderr,"Use: %s [-a localaddr | -b localaddr] [-d] [-q] [-p localport] [-t timer] machine port \n",myname); exit(-1); } - if ((remoteport=atoi(argv[2]))<=0) { @@ -127,7 +128,7 @@ fprintf(stderr, "Bad remote port number.\n"); exit(-1); } -@@ -166,11 +208,12 @@ +@@ -166,11 +209,12 @@ memset((char *) &rem_addr, 0, sizeof(rem_addr)); memset((char *) &srv_addr, 0, sizeof(srv_addr)); memset((char *) &cl_addr, 0, sizeof(cl_addr)); @@ -142,7 +143,7 @@ if (cl_addr.sin_addr.s_addr==-1) { fprintf(stderr, "Unknown host.\n"); exit(-1); -@@ -178,19 +221,43 @@ +@@ -178,19 +222,43 @@ } else cl_addr.sin_addr=*(struct in_addr *)(hp->h_addr_list[0]); @@ -189,7 +190,7 @@ close(0); close(1); close(2); chdir("/"); #ifdef TIOCNOTTY -@@ -202,11 +269,13 @@ +@@ -202,11 +270,15 @@ if (fork()) exit(0); while (1) { len=sizeof(rem_addr); @@ -199,12 +200,14 @@ if (errno==EINTR) continue; exit(-1); } -+ syslog( LOG_NOTICE, "connection from %s to local port %i. Bouncing to %s, %i", -+ inet_ntoa(rem_addr.sin_addr), myport, argv[0], remoteport ); ++ if (!q) { ++ syslog( LOG_NOTICE, "connection from %s to local port %i. Bouncing to %s, %i", ++ inet_ntoa(rem_addr.sin_addr), myport, argv[0], remoteport ); ++ } switch(fork()) { case -1: /* we're in the background.. no-one to complain to */ -@@ -220,6 +289,17 @@ +@@ -220,6 +292,17 @@ close(rem_fd); exit(-1); } >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904040441.n344fVGs053657>