From 0eb707fdcf1b87e71bb3a9eaa8472d0b05799a3d Mon Sep 17 00:00:00 2001 From: Terry Dawson VK2KTJ Date: Wed, 12 Sep 2001 13:18:43 +0000 Subject: updated libtool, uniformly indented source, corrected small ax25mond Makefile bug --- ax25ipd/ax25ipd.c | 190 +++++++++++++++++++++++++++--------------------------- 1 file changed, 96 insertions(+), 94 deletions(-) (limited to 'ax25ipd/ax25ipd.c') diff --git a/ax25ipd/ax25ipd.c b/ax25ipd/ax25ipd.c index e73f36b..45e59fa 100644 --- a/ax25ipd/ax25ipd.c +++ b/ax25ipd/ax25ipd.c @@ -33,16 +33,16 @@ int opt_help = 0; char opt_configfile[1024]; struct option options[] = { - "version", 0, &opt_version, 1, - "loglevel", 1, &opt_loglevel, 1, - "help", 0, &opt_help, 1, - "configfile", 1, NULL, 0, - 0,0,0,0 }; - -int -main(int argc, char **argv) + "version", 0, &opt_version, 1, + "loglevel", 1, &opt_loglevel, 1, + "help", 0, &opt_help, 1, + "configfile", 1, NULL, 0, + 0, 0, 0, 0 +}; + +int main(int argc, char **argv) { - if(setjmp(restart_env)==0) { + if (setjmp(restart_env) == 0) { signal(SIGHUP, hupper); } @@ -51,58 +51,65 @@ main(int argc, char **argv) signal(SIGINT, int_handler); signal(SIGTERM, term_handler); - while(1) { - int option_index = 0; - int c; - - c = getopt_long(argc, argv, "c:hl:v", options, &option_index); - if (c == -1) - break; - - switch (c) { - case 0: - break; - switch(option_index) { - case 0: case 2: - break; - case 1: - opt_loglevel = atoi(optarg); - break; - case 3: - strncpy(opt_configfile, optarg, 1023); - break; - - } - break; - case 'c' : - strncpy(opt_configfile, optarg, 1023); - break; - case 'v': - opt_version = 1; - break; - case 'l': - opt_loglevel = atoi(optarg); - break; - } - } - - if (optind < argc) { printf ("config %s\n", argv[optind++]); } - - if (opt_version == 1) { - greet_world(); - exit(0); - } - if (opt_help == 1) { - greet_world(); - printf ("Usage:\n"); - printf ("%s [flags]\n",argv[0]); - printf ("\nFlags:\n"); - printf (" --version, -v Print version of program\n"); - printf (" --help, -h This help screen\n"); - printf (" --loglevel NUM, -l NUM Set logging level to NUM\n"); - printf (" --configfile FILE, -c FILE Set confgiuration file to FILE\n"); - exit(0); - } + while (1) { + int option_index = 0; + int c; + + c = getopt_long(argc, argv, "c:hl:v", options, + &option_index); + if (c == -1) + break; + + switch (c) { + case 0: + break; + switch (option_index) { + case 0: + case 2: + break; + case 1: + opt_loglevel = atoi(optarg); + break; + case 3: + strncpy(opt_configfile, optarg, 1023); + break; + + } + break; + case 'c': + strncpy(opt_configfile, optarg, 1023); + break; + case 'v': + opt_version = 1; + break; + case 'l': + opt_loglevel = atoi(optarg); + break; + } + } + + if (optind < argc) { + printf("config %s\n", argv[optind++]); + } + + if (opt_version == 1) { + greet_world(); + exit(0); + } + if (opt_help == 1) { + greet_world(); + printf("Usage:\n"); + printf("%s [flags]\n", argv[0]); + printf("\nFlags:\n"); + printf + (" --version, -v Print version of program\n"); + printf(" --help, -h This help screen\n"); + printf + (" --loglevel NUM, -l NUM Set logging level to NUM\n"); + printf + (" --configfile FILE, -c FILE Set confgiuration file to FILE\n"); + exit(0); + } /* Initialize all routines */ config_init(); @@ -131,21 +138,21 @@ main(int argc, char **argv) /* and let the games begin */ io_start(); - return(0); + return (0); } -void -greet_world() +void greet_world() { printf("\nax25ipd %s / %s\n", VERS2, VERSION); - printf("Copyright 1991, Michael Westerhof, Sun Microsystems, Inc.\n"); - printf("This software may be freely used, distributed, or modified, providing\nthis header is not removed\n\n"); + printf + ("Copyright 1991, Michael Westerhof, Sun Microsystems, Inc.\n"); + printf + ("This software may be freely used, distributed, or modified, providing\nthis header is not removed\n\n"); fflush(stdout); } -void -do_stats() +void do_stats() { int save_loglevel; @@ -162,24 +169,24 @@ do_stats() dump_params(); printf("\nInput stats:\n"); - printf("KISS input packets: %d\n",stats.kiss_in); - printf(" too big: %d\n",stats.kiss_toobig); - printf(" bad type: %d\n",stats.kiss_badtype); - printf(" too short: %d\n",stats.kiss_tooshort); - printf(" not for me: %d\n",stats.kiss_not_for_me); - printf(" I am destination: %d\n",stats.kiss_i_am_dest); - printf(" no route found: %d\n",stats.kiss_no_ip_addr); - printf("UDP input packets: %d\n",stats.udp_in); - printf("IP input packets: %d\n",stats.ip_in); - printf(" failed CRC test: %d\n",stats.ip_failed_crc); - printf(" too short: %d\n",stats.ip_tooshort); - printf(" not for me: %d\n",stats.ip_not_for_me); - printf(" I am destination: %d\n",stats.ip_i_am_dest); + printf("KISS input packets: %d\n", stats.kiss_in); + printf(" too big: %d\n", stats.kiss_toobig); + printf(" bad type: %d\n", stats.kiss_badtype); + printf(" too short: %d\n", stats.kiss_tooshort); + printf(" not for me: %d\n", stats.kiss_not_for_me); + printf(" I am destination: %d\n", stats.kiss_i_am_dest); + printf(" no route found: %d\n", stats.kiss_no_ip_addr); + printf("UDP input packets: %d\n", stats.udp_in); + printf("IP input packets: %d\n", stats.ip_in); + printf(" failed CRC test: %d\n", stats.ip_failed_crc); + printf(" too short: %d\n", stats.ip_tooshort); + printf(" not for me: %d\n", stats.ip_not_for_me); + printf(" I am destination: %d\n", stats.ip_i_am_dest); printf("\nOutput stats:\n"); - printf("KISS output packets: %d\n",stats.kiss_out); - printf(" beacons: %d\n",stats.kiss_beacon_outs); - printf("UDP output packets: %d\n",stats.udp_out); - printf("IP output packets: %d\n",stats.ip_out); + printf("KISS output packets: %d\n", stats.kiss_out); + printf(" beacons: %d\n", stats.kiss_beacon_outs); + printf("UDP output packets: %d\n", stats.udp_out); + printf("IP output packets: %d\n", stats.ip_out); printf("\n"); fflush(stdout); @@ -188,33 +195,28 @@ do_stats() loglevel = save_loglevel; } -void -hupper(int i) +void hupper(int i) { printf("\nSIGHUP!\n"); longjmp(restart_env, 1); } -void -usr1_handler(int i) +void usr1_handler(int i) { printf("\nSIGUSR1!\n"); do_stats(); } -void -int_handler(int i) +void int_handler(int i) { printf("\nSIGINT!\n"); do_stats(); exit(1); } -void -term_handler(int i) +void term_handler(int i) { printf("\nSIGTERM!\n"); do_stats(); exit(1); } - -- cgit v1.2.3