Menu
▾
▴
[Radmind-commit] radmind connect.c, 1.30, 1.31 connect.h, 1.14, 1.15 ktcheck.c, 1.128, 1.129 lapply.c, 1.142, 1.143 lcreate.c, 1.90, 1.91 lfdiff.c, 1.63, 1.64 repo.c, 1.12, 1.13
|
From: Andrew M. <fit...@us...> - 2007-12-13 22:56:17
|
Update of /cvsroot/radmind/radmind In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6298 Modified Files: connect.c connect.h ktcheck.c lapply.c lcreate.c lfdiff.c repo.c Log Message: Improved port handling. Index: connect.c =================================================================== RCS file: /cvsroot/radmind/radmind/connect.c,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** connect.c 16 Nov 2007 19:22:08 -0000 1.30 --- connect.c 13 Dec 2007 22:56:12 -0000 1.31 *************** *** 98,111 **** SNET * ! connectsn( char *host, int port ) { int i; struct hostent *he; struct sockaddr_in sin; SNET *sn = NULL; memset( &sin, 0, sizeof( struct sockaddr_in )); sin.sin_family = AF_INET; ! sin.sin_port = port; #ifdef notdef --- 98,119 ---- SNET * ! connectsn( char *host, unsigned short port ) { int i; struct hostent *he; struct sockaddr_in sin; + struct servent *se; SNET *sn = NULL; memset( &sin, 0, sizeof( struct sockaddr_in )); sin.sin_family = AF_INET; ! if (( sin.sin_port = port ) == 0 ) { ! /* maybe radmind's in /etc/services. if not, use default. */ ! if (( se = getservbyname( "radmind", "tcp" )) != NULL ) { ! sin.sin_port = htons( se->s_port ); ! } else { ! sin.sin_port = htons( RADMIND_IANA_PORT ); ! } ! } #ifdef notdef *************** *** 135,140 **** * legacy port if the new port connection fails. */ ! if (( sn = connectsn2( &sin )) == NULL ! && port == htons( RADMIND_IANA_PORT )) { /* try connecting to old non-IANA registered port */ sin.sin_port = htons( RADMIND_LEGACY_PORT ); --- 143,147 ---- * legacy port if the new port connection fails. */ ! if (( sn = connectsn2( &sin )) == NULL && port == 0 ) { /* try connecting to old non-IANA registered port */ sin.sin_port = htons( RADMIND_LEGACY_PORT ); Index: connect.h =================================================================== RCS file: /cvsroot/radmind/radmind/connect.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** connect.h 28 Dec 2006 16:07:18 -0000 1.14 --- connect.h 13 Dec 2007 22:56:12 -0000 1.15 *************** *** 4,8 **** */ ! SNET * connectsn( char *host, int port ); int closesn( SNET *sn ); char **get_capabilities( SNET * ); --- 4,8 ---- */ ! SNET * connectsn( char *host, unsigned short port ); int closesn( SNET *sn ); char **get_capabilities( SNET * ); Index: lcreate.c =================================================================== RCS file: /cvsroot/radmind/radmind/lcreate.c,v retrieving revision 1.90 retrieving revision 1.91 diff -C2 -d -r1.90 -r1.91 *** lcreate.c 28 Nov 2007 21:31:03 -0000 1.90 --- lcreate.c 13 Dec 2007 22:56:12 -0000 1.91 *************** *** 73,80 **** main( int argc, char **argv ) { ! int c, err = 0, port = htons( 6222 ), tac; int network = 1, len = 0, rc; int negative = 0, tran_only = 0; int respcount = 0; extern int optind; struct servent *se; --- 73,81 ---- main( int argc, char **argv ) { ! int c, err = 0, tac; int network = 1, len = 0, rc; int negative = 0, tran_only = 0; int respcount = 0; + unsigned short port = 0; extern int optind; struct servent *se; *************** *** 140,150 **** case 'p': ! if (( port = htons( atoi( optarg ))) == 0 ) { ! if (( se = getservbyname( optarg, "tcp" )) == NULL ) { ! fprintf( stderr, "%s: service unknown\n", optarg ); ! exit( 2 ); ! } ! port = se->s_port; ! } break; --- 141,146 ---- case 'p': ! /* connect.c handles things if atoi returns 0 */ ! port = htons( atoi( optarg )); break; Index: repo.c =================================================================== RCS file: /cvsroot/radmind/radmind/repo.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** repo.c 28 Nov 2007 21:31:03 -0000 1.12 --- repo.c 13 Dec 2007 22:56:12 -0000 1.13 *************** *** 47,55 **** { SNET *sn; ! int c, port = htons( 6222 ); ! int i = 0, err = 0, len; int authlevel = _RADMIND_AUTHLEVEL; int use_randfile = 0; extern int optind; struct servent *se; char *host = _RADMIND_HOST; --- 47,55 ---- { SNET *sn; ! int c, i = 0, err = 0, len; int authlevel = _RADMIND_AUTHLEVEL; int use_randfile = 0; extern int optind; + unsigned short port = 0; struct servent *se; char *host = _RADMIND_HOST; *************** *** 69,79 **** case 'p': ! if (( port = htons( atoi( optarg ))) == 0 ) { ! if (( se = getservbyname( optarg, "tcp" )) == NULL ) { ! fprintf( stderr, "%s: service unknown\n", optarg ); ! exit( 2 ); ! } ! port = se->s_port; ! } break; --- 69,74 ---- case 'p': ! /* connect.c handles things if atoi returns 0 */ ! port = htons( atoi( optarg )); break; Index: ktcheck.c =================================================================== RCS file: /cvsroot/radmind/radmind/ktcheck.c,v retrieving revision 1.128 retrieving revision 1.129 diff -C2 -d -r1.128 -r1.129 *** ktcheck.c 28 Nov 2007 21:31:03 -0000 1.128 --- ktcheck.c 13 Dec 2007 22:56:12 -0000 1.129 *************** *** 547,554 **** main( int argc, char **argv ) { ! int c, port = htons( 6222 ), err = 0; int authlevel = _RADMIND_AUTHLEVEL; int use_randfile = 0; int clean = 0; char lcksum[ SZ_BASE64_E( EVP_MAX_MD_SIZE ) ]; char tcksum[ SZ_BASE64_E( EVP_MAX_MD_SIZE ) ]; --- 547,555 ---- main( int argc, char **argv ) { ! int c, err = 0; int authlevel = _RADMIND_AUTHLEVEL; int use_randfile = 0; int clean = 0; + unsigned short port = 0; char lcksum[ SZ_BASE64_E( EVP_MAX_MD_SIZE ) ]; char tcksum[ SZ_BASE64_E( EVP_MAX_MD_SIZE ) ]; *************** *** 599,609 **** case 'p': ! if (( port = htons ( atoi( optarg )) ) == 0 ) { ! if (( se = getservbyname( optarg, "tcp" )) == NULL ) { ! fprintf( stderr, "%s: service unknown\n", optarg ); ! exit( 2 ); ! } ! port = se->s_port; ! } break; --- 600,605 ---- case 'p': ! /* connect.c handles things if atoi returns 0 */ ! port = htons( atoi( optarg )); break; Index: lapply.c =================================================================== RCS file: /cvsroot/radmind/radmind/lapply.c,v retrieving revision 1.142 retrieving revision 1.143 diff -C2 -d -r1.142 -r1.143 *** lapply.c 28 Nov 2007 21:31:03 -0000 1.142 --- lapply.c 13 Dec 2007 22:56:12 -0000 1.143 *************** *** 231,235 **** main( int argc, char **argv ) { ! int c, port = htons( 6222 ), err = 0; extern int optind; FILE *f = NULL; --- 231,236 ---- main( int argc, char **argv ) { ! int c, err = 0; ! unsigned short port = 0; extern int optind; FILE *f = NULL; *************** *** 295,305 **** case 'p': ! if (( port = htons ( atoi( optarg ))) == 0 ) { ! if (( se = getservbyname( optarg, "tcp" )) == NULL ) { ! fprintf( stderr, "%s: service unknown\n", optarg ); ! exit( 2 ); ! } ! port = se->s_port; ! } break; --- 296,301 ---- case 'p': ! /* connect.c handles things if atoi returns 0 */ ! port = htons( atoi( optarg )); break; Index: lfdiff.c =================================================================== RCS file: /cvsroot/radmind/radmind/lfdiff.c,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** lfdiff.c 28 Nov 2007 21:31:03 -0000 1.63 --- lfdiff.c 13 Dec 2007 22:56:12 -0000 1.64 *************** *** 114,120 **** main( int argc, char **argv, char **envp ) { ! int c, i, tac, port = htons( 6222 ), err = 0; int special = 0, diffargc = 0; int fd; extern int optind; extern char *version; --- 114,121 ---- main( int argc, char **argv, char **envp ) { ! int c, i, tac, err = 0; int special = 0, diffargc = 0; int fd; + unsigned short port = 0; extern int optind; extern char *version; *************** *** 162,172 **** case 'p': ! if (( port = htons ( atoi( optarg ))) == 0 ) { ! if (( se = getservbyname( optarg, "tcp" )) == NULL ) { ! fprintf( stderr, "%s: service unknown\n", optarg ); ! exit( 2 ); ! } ! port = se->s_port; ! } break; --- 163,168 ---- case 'p': ! /* connect.c handles things if atoi returns 0 */ ! port = htons( atoi( optarg )); break; |
