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/config.c | 325 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 185 insertions(+), 140 deletions(-) (limited to 'ax25ipd/config.c') diff --git a/ax25ipd/config.c b/ax25ipd/config.c index 243b82c..b80d113 100644 --- a/ax25ipd/config.c +++ b/ax25ipd/config.c @@ -23,21 +23,24 @@ #include "ax25ipd.h" /* Initialize the config table */ -void -config_init() +void config_init() { int i; *ttydevice = '\0'; - for(i=0;i<7;i++)mycallsign[i]='\0'; - for(i=0;i<7;i++)myalias[i]='\0'; - for(i=0;i<7;i++)mycallsign2[i]='\0'; - for(i=0;i<7;i++)myalias2[i]='\0'; + for (i = 0; i < 7; i++) + mycallsign[i] = '\0'; + for (i = 0; i < 7; i++) + myalias[i] = '\0'; + for (i = 0; i < 7; i++) + mycallsign2[i] = '\0'; + for (i = 0; i < 7; i++) + myalias2[i] = '\0'; digi = 1; ttyspeed = 9600; loglevel = 0; bc_interval = 0; - bc_text[0]='\0'; + bc_text[0] = '\0'; bc_every = 0; my_udp = htons(0); udp_mode = 0; @@ -65,8 +68,7 @@ config_init() /* Open and read the config file */ -void -config_read(f) +void config_read(f) char *f; { FILE *cf; @@ -74,252 +76,287 @@ char *f; int errflag, e, lineno; char *fname; - if (f) fname = f; - else fname = CONF_AX25IPD_FILE; + if (f) + fname = f; + else + fname = CONF_AX25IPD_FILE; - if((cf = fopen(fname,"r"))==NULL) { - fprintf(stderr,"Config file %s not found or could not be opened\n",fname); + if ((cf = fopen(fname, "r")) == NULL) { + fprintf(stderr, + "Config file %s not found or could not be opened\n", + fname); exit(1); } errflag = 0; lineno = 0; - while(fgets(buf, 255, cf)!=NULL) { + while (fgets(buf, 255, cf) != NULL) { strcpy(cbuf, buf); lineno++; - if((e = parse_line(buf)) < 0) { - fprintf(stderr,"Config error at line %d: ",lineno); - if(e==-1)fprintf(stderr,"Missing argument\n"); - else if(e==-2)fprintf(stderr,"Bad callsign format\n"); - else if(e==-3)fprintf(stderr,"Bad option - on/off\n"); - else if(e==-4)fprintf(stderr,"Bad option - tnc/digi\n"); - else if(e==-5)fprintf(stderr,"Host not known\n"); - else if(e==-6)fprintf(stderr,"Unknown command\n"); - else if(e==-7)fprintf(stderr,"Text string too long\n"); - else if(e==-8)fprintf(stderr,"Bad option - every/after\n"); - else if(e==-9)fprintf(stderr,"Bad option - ip/udp\n"); - else fprintf(stderr,"Unknown error\n"); - fprintf(stderr,"%s",cbuf); + if ((e = parse_line(buf)) < 0) { + fprintf(stderr, "Config error at line %d: ", + lineno); + if (e == -1) + fprintf(stderr, "Missing argument\n"); + else if (e == -2) + fprintf(stderr, "Bad callsign format\n"); + else if (e == -3) + fprintf(stderr, "Bad option - on/off\n"); + else if (e == -4) + fprintf(stderr, "Bad option - tnc/digi\n"); + else if (e == -5) + fprintf(stderr, "Host not known\n"); + else if (e == -6) + fprintf(stderr, "Unknown command\n"); + else if (e == -7) + fprintf(stderr, "Text string too long\n"); + else if (e == -8) + fprintf(stderr, + "Bad option - every/after\n"); + else if (e == -9) + fprintf(stderr, "Bad option - ip/udp\n"); + else + fprintf(stderr, "Unknown error\n"); + fprintf(stderr, "%s", cbuf); errflag++; } } - if(errflag)exit(1); + if (errflag) + exit(1); - if(strlen(ttydevice)==0) { - fprintf(stderr,"No device specified in config file\n"); + if (strlen(ttydevice) == 0) { + fprintf(stderr, "No device specified in config file\n"); exit(1); } - if((udp_mode == 0) && (ip_mode == 0)) { - fprintf(stderr,"Must specify ip and/or udp sockets\n"); + if ((udp_mode == 0) && (ip_mode == 0)) { + fprintf(stderr, "Must specify ip and/or udp sockets\n"); exit(1); } - if(digi) { - if(mycallsign[0]=='\0') { - fprintf(stderr,"No mycall line in config file\n"); + if (digi) { + if (mycallsign[0] == '\0') { + fprintf(stderr, "No mycall line in config file\n"); exit(1); } } - if((digi) && (dual_port)) { - if(mycallsign2[0]=='\0') { - fprintf(stderr,"No mycall2 line in config file\n"); + if ((digi) && (dual_port)) { + if (mycallsign2[0] == '\0') { + fprintf(stderr, + "No mycall2 line in config file\n"); exit(1); } } } /* Process each line from the config file. The return value is encoded. */ -int -parse_line(buf) +int parse_line(buf) char *buf; { char *p, *q; unsigned char tcall[7], tip[4]; struct hostent *he; - int i,j, uport; + int i, j, uport; unsigned int flags; p = strtok(buf, " \t\n\r"); - if(p==NULL)return 0; - if(*p=='#')return 0; + if (p == NULL) + return 0; + if (*p == '#') + return 0; - if(strcmp(p,"mycall")==0) { + if (strcmp(p, "mycall") == 0) { q = strtok(NULL, " \t\n\r"); - if(q==NULL)return -1; - if(a_to_call(q, mycallsign)!=0)return -2; + if (q == NULL) + return -1; + if (a_to_call(q, mycallsign) != 0) + return -2; return 0; - } else if(strcmp(p,"mycall2")==0) { + } else if (strcmp(p, "mycall2") == 0) { q = strtok(NULL, " \t\n\r"); - if(q==NULL)return -1; - if(a_to_call(q, mycallsign2)!=0)return -2; + if (q == NULL) + return -1; + if (a_to_call(q, mycallsign2) != 0) + return -2; return 0; - } else if(strcmp(p,"myalias")==0) { + } else if (strcmp(p, "myalias") == 0) { q = strtok(NULL, " \t\n\r"); - if(q==NULL)return -1; - if(a_to_call(q, myalias)!=0)return -2; + if (q == NULL) + return -1; + if (a_to_call(q, myalias) != 0) + return -2; dual_port = 1; - if(mycallsign2[0]=='\0') { - dual_port = 0; + if (mycallsign2[0] == '\0') { + dual_port = 0; } return 0; - } else if(strcmp(p,"myalias2")==0) { + } else if (strcmp(p, "myalias2") == 0) { q = strtok(NULL, " \t\n\r"); - if(q==NULL)return -1; - if(a_to_call(q, myalias2)!=0)return -2; + if (q == NULL) + return -1; + if (a_to_call(q, myalias2) != 0) + return -2; return 0; - } else if(strcmp(p,"device")==0) { + } else if (strcmp(p, "device") == 0) { q = strtok(NULL, " \t\n\r"); - if(q==NULL)return -1; + if (q == NULL) + return -1; strcpy(ttydevice, q); return 0; - } else if(strcmp(p,"mode")==0) { + } else if (strcmp(p, "mode") == 0) { q = strtok(NULL, " \t\n\r"); - if(q==NULL)return -1; - if(strcmp(q,"digi")==0) digi = 1; - else if(strcmp(q,"tnc")==0) digi = 0; - else return -4; + if (q == NULL) + return -1; + if (strcmp(q, "digi") == 0) + digi = 1; + else if (strcmp(q, "tnc") == 0) + digi = 0; + else + return -4; return 0; - } else if(strcmp(p,"speed")==0) { + } else if (strcmp(p, "speed") == 0) { q = strtok(NULL, " \t\n\r"); - if(q==NULL)return -1; + if (q == NULL) + return -1; ttyspeed = atoi(q); return 0; - } else if(strcmp(p,"socket")==0) { + } else if (strcmp(p, "socket") == 0) { q = strtok(NULL, " \t\n\r"); - if (q==NULL) + if (q == NULL) return -1; - if (strcmp(q,"ip")==0) { + if (strcmp(q, "ip") == 0) { ip_mode = 1; - } - else if(strcmp(q,"udp")==0) { + } else if (strcmp(q, "udp") == 0) { udp_mode = 1; my_udp = htons(DEFAULT_UDP_PORT); q = strtok(NULL, " \t\n\r"); - if (q!=NULL) { + if (q != NULL) { i = atoi(q); - if (i>0) + if (i > 0) my_udp = htons(i); } - } - else + } else return -9; return 0; - } else if(strcmp(p,"beacon")==0) { + } else if (strcmp(p, "beacon") == 0) { q = strtok(NULL, " \t\n\r"); - if (q==NULL) + if (q == NULL) return -1; - if (strcmp(q,"every")==0) + if (strcmp(q, "every") == 0) bc_every = 1; - else if (strcmp(q,"after")==0) + else if (strcmp(q, "after") == 0) bc_every = 0; else return -8; q = strtok(NULL, " \t\n\r"); - if (q==NULL) + if (q == NULL) return -1; bc_interval = atoi(q); return 0; /* This next one is a hack!!!!!! watch out!!!! */ - } else if(strcmp(p,"btext")==0) { + } else if (strcmp(p, "btext") == 0) { q = p + strlen(p) + 1; - if(strlen(q) < 2) return -1; /* line ends with a \n */ - if(strlen(q) > sizeof bc_text)return -7; - q[strlen(q)-1]='\0'; + if (strlen(q) < 2) + return -1; /* line ends with a \n */ + if (strlen(q) > sizeof bc_text) + return -7; + q[strlen(q) - 1] = '\0'; strcpy(bc_text, q); return 0; - } else if(strcmp(p,"loglevel")==0) { + } else if (strcmp(p, "loglevel") == 0) { q = strtok(NULL, " \t\n\r"); - if(q==NULL)return -1; + if (q == NULL) + return -1; loglevel = atoi(q); return 0; - } else if(strcmp(p,"route")==0) { + } else if (strcmp(p, "route") == 0) { uport = 0; flags = 0; q = strtok(NULL, " \t\n\r"); - if(q==NULL) + if (q == NULL) return -1; - if(a_to_call(q, tcall)!=0) + if (a_to_call(q, tcall) != 0) return -2; q = strtok(NULL, " \t\n\r"); - if(q==NULL) + if (q == NULL) return -1; he = gethostbyname(q); - if(he!=NULL) { + if (he != NULL) { memcpy(tip, he->h_addr_list[0], 4); - } else { /* maybe user specified a numeric addr? */ + } else { /* maybe user specified a numeric addr? */ j = inet_addr(q); - if(j==-1) - return -5; /* if -1, bad deal! */ - memcpy(tip, (char *)&j, 4); + if (j == -1) + return -5; /* if -1, bad deal! */ + memcpy(tip, (char *) &j, 4); } - while((q = strtok(NULL, " \t\n\r"))!=NULL) { - if(strcmp(q,"udp")==0) { + while ((q = strtok(NULL, " \t\n\r")) != NULL) { + if (strcmp(q, "udp") == 0) { uport = DEFAULT_UDP_PORT; q = strtok(NULL, " \t\n\r"); - if(q!=NULL) { + if (q != NULL) { i = atoi(q); - if(i>0) + if (i > 0) uport = i; } } else { /* Test for broadcast flag */ - if (strchr(q,'b')) { - flags|=AXRT_BCAST; + if (strchr(q, 'b')) { + flags |= AXRT_BCAST; } /* Test for Default flag */ - if (strchr(q,'d')) { - flags|=AXRT_DEFAULT; + if (strchr(q, 'd')) { + flags |= AXRT_DEFAULT; } } } route_add(tip, tcall, uport, flags); return 0; - } else if(strcmp(p,"broadcast")==0) { + } else if (strcmp(p, "broadcast") == 0) { - while ((q = strtok(NULL, " \t\n\r"))!=NULL) { - if (a_to_call(q, tcall)!=0) + while ((q = strtok(NULL, " \t\n\r")) != NULL) { + if (a_to_call(q, tcall) != 0) return -2; bcast_add(tcall); } return 0; - } else if(strcmp(p,"param")==0) { + } else if (strcmp(p, "param") == 0) { q = strtok(NULL, " \t\n\r"); - if(q==NULL)return -1; + if (q == NULL) + return -1; i = atoi(q); q = strtok(NULL, " \t\n\r"); - if(q==NULL)return -1; + if (q == NULL) + return -1; j = atoi(q); - param_add(i,j); + param_add(i, j); return 0; } return -999; } /* Convert ascii callsign to internal format */ -int -a_to_call(text, tcall) +int a_to_call(text, tcall) char *text; unsigned char *tcall; { @@ -327,32 +364,35 @@ unsigned char *tcall; int ssid; unsigned char c; - if(strlen(text)==0)return -1; + if (strlen(text) == 0) + return -1; ssid = 0; - for(i=0;i<6;i++) { - tcall[i]=(' '<<1); + for (i = 0; i < 6; i++) { + tcall[i] = (' ' << 1); } tcall[6] = '\0'; - for(i=0;i15)return -1; - tcall[6] = (ssid<<1); + if (c == '-') { + ssid = atoi(&text[i + 1]); + if (ssid > 15) + return -1; + tcall[6] = (ssid << 1); return 0; } - if(islower(c))c = toupper(c); - if(i>5)return -1; - tcall[i]=(c<<1); + if (islower(c)) + c = toupper(c); + if (i > 5) + return -1; + tcall[i] = (c << 1); } return 0; } /* Convert internal callsign to printable format */ -char * -call_to_a(tcall) +char *call_to_a(tcall) unsigned char *tcall; { int i; @@ -360,17 +400,18 @@ unsigned char *tcall; char *tptr; static char t[10]; - for(i=0,tptr=t;i<6;i++) { - if(tcall[i]==(' '<<1))break; - *tptr = tcall[i]>>1; + for (i = 0, tptr = t; i < 6; i++) { + if (tcall[i] == (' ' << 1)) + break; + *tptr = tcall[i] >> 1; tptr++; } - ssid = (tcall[6]>>1)&0x0f; - if(ssid>0) { + ssid = (tcall[6] >> 1) & 0x0f; + if (ssid > 0) { *tptr = '-'; tptr++; - if(ssid>9) { + if (ssid > 9) { *tptr = '1'; tptr++; ssid -= 10; @@ -384,21 +425,25 @@ unsigned char *tcall; } /* print the configuration data out */ -void -dump_config() +void dump_config() { LOGL1("\nCurrent configuration:\n"); - if(ip_mode) LOGL1(" socket ip\n"); - if(udp_mode)LOGL1(" socket udp on port %d\n", ntohs(my_udp)); + if (ip_mode) + LOGL1(" socket ip\n"); + if (udp_mode) + LOGL1(" socket udp on port %d\n", ntohs(my_udp)); LOGL1(" mode %s\n", digi ? "digi" : "tnc"); LOGL1(" device %s\n", ttydevice); LOGL1(" speed %d\n", ttyspeed); - if(digi)LOGL1(" mycall %s\n", call_to_a(mycallsign)); - if(digi && myalias[0])LOGL1(" myalias %s\n", call_to_a(myalias)); - if(bc_interval>0) { - LOGL1(" beacon %s %d\n", bc_every ? "every" : "after", bc_interval); + if (digi) + LOGL1(" mycall %s\n", call_to_a(mycallsign)); + if (digi && myalias[0]) + LOGL1(" myalias %s\n", call_to_a(myalias)); + if (bc_interval > 0) { + LOGL1(" beacon %s %d\n", bc_every ? "every" : "after", + bc_interval); LOGL1(" btext %s\n", bc_text); } LOGL1(" loglevel %d\n", loglevel); - (void)fflush(stdout); + (void) fflush(stdout); } -- cgit v1.2.3