From 43b4bb1474e092a0b87f3b23b5246900c94e1d4e Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 4 Jun 2013 23:19:01 +0200 Subject: Use dist_ prefix in Makefile.am rather than EXTRA_DIST where possible. Signed-off-by: Ralf Baechle --- netrom/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'netrom') diff --git a/netrom/Makefile.am b/netrom/Makefile.am index 0678996..fc2361b 100644 --- a/netrom/Makefile.am +++ b/netrom/Makefile.am @@ -13,10 +13,10 @@ sbin_PROGRAMS = netromd nodesave nrattach nrparms nrsdrv LDADD = $(AX25_LIB) -man_MANS = netrom.4 nrbroadcast.5 netromd.8 nodesave.8 \ +dist_man_MANS = netrom.4 nrbroadcast.5 netromd.8 nodesave.8 \ nrattach.8 nrparms.8 nrsdrv.8 -EXTRA_DIST = $(man_MANS) $(etcfiles) +EXTRA_DIST = $(etcfiles) netromd_SOURCES = \ netromd.c \ -- cgit v1.2.3 From 0b4425760be1f92a1f25daeb5d3dc91814a98622 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 5 Jun 2013 00:55:50 +0200 Subject: Nuke trailing blank lines. Signed-off-by: Ralf Baechle --- netrom/Makefile.am | 1 - 1 file changed, 1 deletion(-) (limited to 'netrom') diff --git a/netrom/Makefile.am b/netrom/Makefile.am index fc2361b..ffc3984 100644 --- a/netrom/Makefile.am +++ b/netrom/Makefile.am @@ -30,4 +30,3 @@ INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ AX25_SYSCONFDIR=${sysconfdir}/ax25/ AX25_LOCALSTATEDIR=${localstatedir}/ax25/ - -- cgit v1.2.3 From 1245fbd2a8d60bab7b16b8a1d3c0122fee72f53f Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 5 Jun 2013 00:57:38 +0200 Subject: Nuke trailing whitespace. Signed-off-by: Ralf Baechle --- netrom/Makefile.am | 6 +++--- netrom/netrom.4 | 2 +- netrom/netromd.c | 26 +++++++++++++------------- netrom/netromr.c | 6 +++--- netrom/netromt.c | 14 +++++++------- netrom/nrattach.c | 40 ++++++++++++++++++++-------------------- netrom/nrparms.c | 16 ++++++++-------- netrom/nrsdrv.c | 20 ++++++++++---------- 8 files changed, 65 insertions(+), 65 deletions(-) (limited to 'netrom') diff --git a/netrom/Makefile.am b/netrom/Makefile.am index ffc3984..97e1741 100644 --- a/netrom/Makefile.am +++ b/netrom/Makefile.am @@ -1,5 +1,5 @@ -etcfiles = nrbroadcast +etcfiles = nrbroadcast installconf: $(mkinstalldirs) $(DESTDIR)$(AX25_SYSCONFDIR) @@ -22,11 +22,11 @@ netromd_SOURCES = \ netromd.c \ netromd.h \ netromr.c \ - netromt.c + netromt.c INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ - -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" + -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" AX25_SYSCONFDIR=${sysconfdir}/ax25/ AX25_LOCALSTATEDIR=${localstatedir}/ax25/ diff --git a/netrom/netrom.4 b/netrom/netrom.4 index cceae77..a472972 100644 --- a/netrom/netrom.4 +++ b/netrom/netrom.4 @@ -27,7 +27,7 @@ NET/ROM has some unusual properties. Notably in a multi-user system an AX.25 address is often associated with a user, and some users may not have such an association. a set of ioctl calls are provided to manage an association table. -.LP +.LP NET/ROM supports the following socket options for SOL_NETROM. NETROM_T1 is the T1 timer in 1/10ths of a second, NETROM_T2 is the T2 timer in 1/10ths of a second. NETROM_N2, the retry counter is also configurable. There is no 'infinite diff --git a/netrom/netromd.c b/netrom/netromd.c index e7a0362..a78db4b 100644 --- a/netrom/netromd.c +++ b/netrom/netromd.c @@ -17,7 +17,7 @@ #include -#ifdef __GLIBC__ +#ifdef __GLIBC__ #include #else #include @@ -51,7 +51,7 @@ static void terminate(int sig) syslog(LOG_INFO, "terminating on SIGTERM\n"); closelog(); } - + exit(0); } @@ -59,12 +59,12 @@ static int bcast_config_load_ports(void) { char buffer[255], port[32], *s; FILE *fp; - + if ((fp = fopen(CONF_NETROMD_FILE, "r")) == NULL) { fprintf(stderr, "netromd: cannot open config file\n"); return -1; } - + while (fgets(buffer, 255, fp) != NULL) { if ((s = strchr(buffer, '\n')) != NULL) *s = '\0'; @@ -109,16 +109,16 @@ static int bcast_config_load_ports(void) fprintf(stderr, "netromd: invalid verbose setting\n"); return -1; } - + port_count++; } - + fclose(fp); if (port_count == 0) return -1; - - return 0; + + return 0; } int main(int argc, char **argv) @@ -187,7 +187,7 @@ int main(int argc, char **argv) fprintf(stderr, "netromd: no AX.25 ports defined\n"); return 1; } - + if (nr_config_load_ports() == 0) { fprintf(stderr, "netromd: no NET/ROM ports defined\n"); return 1; @@ -200,7 +200,7 @@ int main(int argc, char **argv) ax25_aton_entry(nr_config_get_addr(NULL), (char *)&my_call); ax25_aton_entry("NODES", (char *)&node_call); - + if ((s = socket(PF_PACKET, SOCK_PACKET, htons(ETH_P_AX25))) == -1) { perror("netromd: socket"); return 1; @@ -210,7 +210,7 @@ int main(int argc, char **argv) fprintf(stderr, "netromd: cannot become a daemon\n"); return 1; } - + if (logging) { openlog("netromd", LOG_PID, LOG_DAEMON); syslog(LOG_INFO, "starting"); @@ -222,7 +222,7 @@ int main(int argc, char **argv) timeout.tv_sec = 30; timeout.tv_usec = 0; - + if (select(s + 1, &fdset, NULL, NULL, &timeout) == -1) continue; /* Signal received ? */ @@ -238,7 +238,7 @@ int main(int argc, char **argv) } if (ax25_cmp((ax25_address *)(buffer + 1), &node_call) == 0 && - ax25_cmp((ax25_address *)(buffer + 8), &my_call) != 0 && + ax25_cmp((ax25_address *)(buffer + 8), &my_call) != 0 && buffer[16] == NETROM_PID && buffer[17] == NODES_SIG) { for (i = 0; i < port_count; i++) { if (strcmp(port_list[i].device, sa.sa_data) == 0) { diff --git a/netrom/netromr.c b/netrom/netromr.c index 9ed716f..3cbaeb4 100644 --- a/netrom/netromr.c +++ b/netrom/netromr.c @@ -14,7 +14,7 @@ #include #include -#ifdef __GLIBC__ +#ifdef __GLIBC__ #include #else #include @@ -160,7 +160,7 @@ void receive_nodes(unsigned char *buffer, int length, ax25_address *neighbour, i } fgets(neigh_buffer, 90, fp); - + obs_count = atoi(neigh_buffer); fclose(fp); @@ -179,7 +179,7 @@ void receive_nodes(unsigned char *buffer, int length, ax25_address *neighbour, i } fgets(neigh_buffer, 90, fp); - + portcall = ax25_ntoa(neighbour); quality = port_list[index].default_qual; diff --git a/netrom/netromt.c b/netrom/netromt.c index b3f99b3..d74b091 100644 --- a/netrom/netromt.c +++ b/netrom/netromt.c @@ -26,7 +26,7 @@ static int build_header(unsigned char *message) { message[0] = NODES_SIG; - + strcpy(message + 1, nr_config_get_alias(NULL)); strncat(message + 1, " ", MNEMONIC_LEN - strlen(message + 1)); @@ -83,12 +83,12 @@ static void build_mine(int s, struct full_sockaddr_ax25 *dest, int dlen, int loc } fclose(fp); - + if (sendto(s, message, len, 0, (struct sockaddr *)dest, dlen) == -1) { if (logging) syslog(LOG_ERR, "netromt: sendto: %m"); } - + sleep(pause); } @@ -129,7 +129,7 @@ static void build_others(int s, int min_obs, struct full_sockaddr_ax25 *dest, in obs_count = atoi(strtok(NULL, " ")); neigh_no = atoi(strtok(NULL, " ")); neighbour = NULL; - + if (obs_count < min_obs || quality == 0) continue; /* "Blank" mnemonic */ @@ -139,7 +139,7 @@ static void build_others(int s, int min_obs, struct full_sockaddr_ax25 *dest, in fseek(fpneigh, 0L, SEEK_SET); fgets(neigh_buffer, 90, fpneigh); - + while (fgets(neigh_buffer, 90, fpneigh) != NULL) { if (atoi(strtok(neigh_buffer, " ")) == neigh_no) { neighbour = strtok(NULL, " "); @@ -172,7 +172,7 @@ static void build_others(int s, int min_obs, struct full_sockaddr_ax25 *dest, in } len += CALLSIGN_LEN; - message[len] = quality; + message[len] = quality; len += QUALITY_LEN; /* No room for another entry? */ @@ -186,7 +186,7 @@ static void build_others(int s, int min_obs, struct full_sockaddr_ax25 *dest, in if (logging) syslog(LOG_ERR, "netromt: sendto: %m"); } - + sleep(pause); } diff --git a/netrom/nrattach.c b/netrom/nrattach.c index 49c5553..0f8055e 100644 --- a/netrom/nrattach.c +++ b/netrom/nrattach.c @@ -34,7 +34,7 @@ int readconfig(char *port) FILE *fp; char buffer[90], *s; int n = 0; - + if ((fp = fopen(CONF_NRPORTS_FILE, "r")) == NULL) { fprintf(stderr, "nrattach: cannot open nrports file\n"); return FALSE; @@ -42,7 +42,7 @@ int readconfig(char *port) while (fgets(buffer, 90, fp) != NULL) { n++; - + if ((s = strchr(buffer, '\n')) != NULL) *s = '\0'; @@ -53,10 +53,10 @@ int readconfig(char *port) fprintf(stderr, "nrattach: unable to parse line %d of the nrports file\n", n); return FALSE; } - + if (strcmp(s, port) != 0) continue; - + if ((s = strtok(NULL, " \t\r\n")) == NULL) { fprintf(stderr, "nrattach: unable to parse line %d of the nrports file\n", n); return FALSE; @@ -82,14 +82,14 @@ int readconfig(char *port) } fclose(fp); - + return TRUE; } - + fclose(fp); fprintf(stderr, "nrattach: cannot find port %s in nrports\n", port); - + return FALSE; } @@ -98,7 +98,7 @@ int getfreedev(char *dev) struct ifreq ifr; int fd; int i; - + if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { perror("nrattach: socket"); return FALSE; @@ -107,7 +107,7 @@ int getfreedev(char *dev) for (i = 0; i < 4; i++) { sprintf(dev, "nr%d", i); strcpy(ifr.ifr_name, dev); - + if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { perror("nrattach: SIOCGIFFLAGS"); return FALSE; @@ -129,17 +129,17 @@ int startiface(char *dev, struct hostent *hp) struct ifreq ifr; char call[7]; int fd; - + if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { perror("nrattach: socket"); return FALSE; } strcpy(ifr.ifr_name, dev); - + if (hp != NULL) { ifr.ifr_addr.sa_family = AF_INET; - + ifr.ifr_addr.sa_data[0] = 0; ifr.ifr_addr.sa_data[1] = 0; ifr.ifr_addr.sa_data[2] = hp->h_addr_list[0][0]; @@ -159,7 +159,7 @@ int startiface(char *dev, struct hostent *hp) ifr.ifr_hwaddr.sa_family = ARPHRD_NETROM; memcpy(ifr.ifr_hwaddr.sa_data, call, 7); - + if (ioctl(fd, SIOCSIFHWADDR, &ifr) != 0) { perror("nrattach: SIOCSIFHWADDR"); return FALSE; @@ -185,12 +185,12 @@ int startiface(char *dev, struct hostent *hp) perror("nrattach: SIOCSIFFLAGS"); return FALSE; } - + close(fd); - + return TRUE; } - + int main(int argc, char *argv[]) { @@ -221,7 +221,7 @@ int main(int argc, char *argv[]) return 1; } } - + if ((argc - optind) != 1) { fprintf(stderr, "usage: nrattach [-i inetaddr] [-m mtu] [-v] port\n"); return 1; @@ -234,11 +234,11 @@ int main(int argc, char *argv[]) fprintf(stderr, "nrattach: cannot find free NET/ROM device\n"); return 1; } - + if (!startiface(dev, hp)) - return 1; + return 1; printf("NET/ROM port %s bound to device %s\n", argv[optind], dev); - + return 0; } diff --git a/netrom/nrparms.c b/netrom/nrparms.c index ff8b60e..b179416 100644 --- a/netrom/nrparms.c +++ b/netrom/nrparms.c @@ -64,12 +64,12 @@ void nodes(int s, char *nodecall, char *op, char *ident, int quality, int count, close(s); exit(1); } - + if (strcmp(ident, "*") != 0) { for (p = ident, q = nr_node.mnemonic; *p != '\0'; p++, q++) *q = toupper(*p); *q = '\0'; - + if (strspn(nr_node.mnemonic, "&#-_/ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789") != strlen(nr_node.mnemonic)) { fprintf(stderr, "nrparms: nodes: invalid ident %s\n", ident); close(s); @@ -101,7 +101,7 @@ void nodes(int s, char *nodecall, char *op, char *ident, int quality, int count, } strcpy(nr_node.device, dev); - + nr_node.quality = quality; nr_node.obs_count = count; @@ -192,7 +192,7 @@ void routes(int s, char *port, char *nodecall, char *rest[]) int main(int argc, char *argv[]) { int s; - + if (argc == 1) { fprintf(stderr, "usage: nrparms -nodes|-routes|-version ...\n"); return 1; @@ -202,12 +202,12 @@ int main(int argc, char *argv[]) printf("nrparms: %s\n", VERSION); return 0; } - + if ((s = socket(AF_NETROM, SOCK_SEQPACKET, 0)) < 0) { perror("nrparms: socket"); return 1; } - + if (strncmp(argv[1], "-n", 2) == 0) { if (argc < 9) { fprintf(stderr, nodes_usage); @@ -231,8 +231,8 @@ int main(int argc, char *argv[]) } fprintf(stderr, "usage: nrparms -nodes|-routes|-version ...\n"); - + close(s); - + return 1; } diff --git a/netrom/nrsdrv.c b/netrom/nrsdrv.c index 92b3d6a..4383f84 100644 --- a/netrom/nrsdrv.c +++ b/netrom/nrsdrv.c @@ -145,7 +145,7 @@ static void nrs_esc(unsigned char *s, int len) *ptr++ = c; break; } - + csum += c; } @@ -192,7 +192,7 @@ static void kiss_esc(unsigned char *s, int len) static void nrs_unesc(unsigned char *buffer, int len) { int i; - + for (i = 0; i < len; i++) { switch (nrs_state) { case NRS_WAIT: @@ -204,7 +204,7 @@ static void nrs_unesc(unsigned char *buffer, int len) break; case NRS_DATA: - switch (buffer[i]) { + switch (buffer[i]) { case STX: /* !! */ nrs_rxcount = 0; nrs_cksum = 0; @@ -225,7 +225,7 @@ static void nrs_unesc(unsigned char *buffer, int len) break; case NRS_ESCAPE: - nrs_state = NRS_DATA; + nrs_state = NRS_DATA; if (nrs_rxcount < 512) { nrs_cksum += buffer[i]; nrs_rxbuffer[nrs_rxcount++] = buffer[i]; @@ -246,7 +246,7 @@ static void nrs_unesc(unsigned char *buffer, int len) static void kiss_unesc(unsigned char *buffer, int len) { int i; - + for (i = 0; i < len; i++) { switch (kiss_state) { case KISS_WAIT: @@ -267,7 +267,7 @@ static void kiss_unesc(unsigned char *buffer, int len) break; case KISS_DATA: - switch (buffer[i]) { + switch (buffer[i]) { case FEND: if (kiss_rxcount > 2) nrs_esc(kiss_rxbuffer, kiss_rxcount); @@ -336,7 +336,7 @@ int main(int argc, char *argv[]) } if (debugging) { - fprintf(stderr,"Flow control %s\n", + fprintf(stderr,"Flow control %s\n", flowcontrol ? "enabled" : "disabled"); } @@ -399,7 +399,7 @@ int main(int argc, char *argv[]) openlog("nrsdrv", LOG_PID, LOG_DAEMON); syslog(LOG_INFO, "KISS device %s connected to NRS device %s\n", argv[optind + 0], argv[optind + 1]); } - + signal(SIGHUP, SIG_IGN); signal(SIGTERM, terminate); @@ -421,7 +421,7 @@ int main(int argc, char *argv[]) for (;;) { FD_ZERO(&read_fd); - + FD_SET(kissfd, &read_fd); FD_SET(nrsfd, &read_fd); @@ -437,7 +437,7 @@ int main(int argc, char *argv[]) } kiss_unesc(buffer, n); } - + if (FD_ISSET(nrsfd, &read_fd)) { if ((n = read(nrsfd, buffer, 512)) <= 0) { if (logging) { -- cgit v1.2.3 From 5feb3d651dbd1b096a26963bd1dffcfe0a5f9eea Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 5 Jun 2013 01:42:05 +0200 Subject: Remove useless initializations to 0 or NULL. They only inflate the .data section of the binary. Initializations to FALSE are still left to do. Signed-off-by: Ralf Baechle --- netrom/netromd.c | 2 +- netrom/nrattach.c | 2 +- netrom/nrsdrv.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'netrom') diff --git a/netrom/netromd.c b/netrom/netromd.c index a78db4b..bd2b69c 100644 --- a/netrom/netromd.c +++ b/netrom/netromd.c @@ -40,7 +40,7 @@ struct port_struct port_list[20]; int port_count = FALSE; int compliant = FALSE; int logging = FALSE; -int debug = 0; +int debug; ax25_address my_call; ax25_address node_call; diff --git a/netrom/nrattach.c b/netrom/nrattach.c index 0f8055e..87ff5aa 100644 --- a/netrom/nrattach.c +++ b/netrom/nrattach.c @@ -27,7 +27,7 @@ #include "../pathnames.h" char *callsign; -int mtu = 0; +int mtu; int readconfig(char *port) { diff --git a/netrom/nrsdrv.c b/netrom/nrsdrv.c index 4383f84..c58c13f 100644 --- a/netrom/nrsdrv.c +++ b/netrom/nrsdrv.c @@ -39,10 +39,10 @@ static char *kissdev, *nrsdev; #define NRS_CKSUM 3 static int nrs_state = NRS_WAIT; -static unsigned char nrs_cksum = 0; +static unsigned char nrs_cksum; static unsigned char nrs_rxbuffer[512]; -static int nrs_rxcount = 0; +static int nrs_rxcount; #define FEND 0300 #define FESC 0333 @@ -56,7 +56,7 @@ static int nrs_rxcount = 0; static int kiss_state = KISS_WAIT; static unsigned char kiss_rxbuffer[512]; -static int kiss_rxcount = 0; +static int kiss_rxcount; static void terminate(int sig) { -- cgit v1.2.3 From 90f6ab2eceada8987fc6e5017ae415eade165c00 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 5 Jun 2013 01:47:40 +0200 Subject: Use tabs for indentation, not spaces. Signed-off-by: Ralf Baechle --- netrom/netromr.c | 2 +- netrom/nrsdrv.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'netrom') diff --git a/netrom/netromr.c b/netrom/netromr.c index 3cbaeb4..1f2e89d 100644 --- a/netrom/netromr.c +++ b/netrom/netromr.c @@ -48,7 +48,7 @@ static int validcallsign(ax25_address *a) } return FALSE; - } + } return TRUE; } diff --git a/netrom/nrsdrv.c b/netrom/nrsdrv.c index c58c13f..52ad0a4 100644 --- a/netrom/nrsdrv.c +++ b/netrom/nrsdrv.c @@ -81,16 +81,16 @@ static void key_rts(int fd) /* Wait for CTS to be low */ while (1) { /* Get CTS status */ - if (ioctl(fd, TIOCMGET, &status) < 0) { + if (ioctl(fd, TIOCMGET, &status) < 0) { syslog(LOG_INFO|LOG_ERR, "TIOCMGET failed: flowcontrol disabled (%m)\n"); flowcontrol = 0; - return; - } + return; + } if (status & TIOCM_CTS) { if (debugging) { fprintf(stderr,"CTS high: waiting\n"); } - ioctl(fd, TIOCMIWAIT, &status); + ioctl(fd, TIOCMIWAIT, &status); } else { break; } @@ -100,10 +100,10 @@ static void key_rts(int fd) fprintf(stderr,"CTS low: keying RTS\n"); } status |= TIOCM_RTS | TIOCM_DTR; - if (ioctl(fd, TIOCMSET, &status) < 0) { + if (ioctl(fd, TIOCMSET, &status) < 0) { syslog(LOG_INFO|LOG_ERR, "TIOCMGET failed: flowcontrol disabled (%m)\n"); flowcontrol = 0; - } + } } static void unkey_rts(int fd) @@ -116,13 +116,13 @@ static void unkey_rts(int fd) if (debugging) { fprintf(stderr,"Transmission finished: unkeying RTS\n"); } - ioctl(fd, TIOCMGET, &status); + ioctl(fd, TIOCMGET, &status); status &= ~TIOCM_RTS; - status |= TIOCM_DTR; - if (ioctl(fd, TIOCMSET, &status) < 0) { + status |= TIOCM_DTR; + if (ioctl(fd, TIOCMSET, &status) < 0) { syslog(LOG_INFO|LOG_ERR, "TIOCMGET failed: flowcontrol disabled (%m)\n"); flowcontrol = 0; - } + } } static void nrs_esc(unsigned char *s, int len) -- cgit v1.2.3 From f76e0b330f0be28f9f3af3073904ede3a34d48f5 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 5 Jun 2013 15:34:56 +0200 Subject: Reformat consistently. Strictly whitespace changes only. Indentation by tabs only. Move case labels in switches are on the same level as the switch keyword. Signed-off-by: Ralf Baechle --- netrom/netromd.c | 78 +++++++++--------- netrom/netromt.c | 16 ++-- netrom/nodesave.c | 22 ++--- netrom/nrattach.c | 36 ++++----- netrom/nrsdrv.c | 238 +++++++++++++++++++++++++++--------------------------- 5 files changed, 195 insertions(+), 195 deletions(-) (limited to 'netrom') diff --git a/netrom/netromd.c b/netrom/netromd.c index bd2b69c..fbad930 100644 --- a/netrom/netromd.c +++ b/netrom/netromd.c @@ -138,46 +138,46 @@ int main(int argc, char **argv) while ((i = getopt(argc, argv, "cdilp:q:t:v")) != -1) { switch (i) { - case 'c': - compliant = TRUE; - break; - case 'd': - debug++; - break; - case 'i': - timelast = 0; - break; - case 'l': - logging = TRUE; - break; - case 'p': - pause = atoi(optarg); - if (pause < 1 || pause > 120) { - fprintf(stderr, "netromd: invalid pause value\n"); - return 1; - } - break; - case 'q': - localval = atoi(optarg); - if (localval < 10 || localval > 255) { - fprintf(stderr, "netromd: invalid local quality\n"); - return 1; - } - break; - case 't': - interval = atoi(optarg) * 60; - if (interval < 60 || interval > 7200) { - fprintf(stderr, "netromd: invalid time interval\n"); - return 1; - } - break; - case 'v': - printf("netromd: %s\n", VERSION); - return 0; - case '?': - case ':': - fprintf(stderr, "usage: netromd [-d] [-i] [-l] [-q quality] [-t interval] [-v]\n"); + case 'c': + compliant = TRUE; + break; + case 'd': + debug++; + break; + case 'i': + timelast = 0; + break; + case 'l': + logging = TRUE; + break; + case 'p': + pause = atoi(optarg); + if (pause < 1 || pause > 120) { + fprintf(stderr, "netromd: invalid pause value\n"); + return 1; + } + break; + case 'q': + localval = atoi(optarg); + if (localval < 10 || localval > 255) { + fprintf(stderr, "netromd: invalid local quality\n"); + return 1; + } + break; + case 't': + interval = atoi(optarg) * 60; + if (interval < 60 || interval > 7200) { + fprintf(stderr, "netromd: invalid time interval\n"); return 1; + } + break; + case 'v': + printf("netromd: %s\n", VERSION); + return 0; + case '?': + case ':': + fprintf(stderr, "usage: netromd [-d] [-i] [-l] [-q quality] [-t interval] [-v]\n"); + return 1; } } diff --git a/netrom/netromt.c b/netrom/netromt.c index d74b091..2a5bc3c 100644 --- a/netrom/netromt.c +++ b/netrom/netromt.c @@ -206,14 +206,14 @@ void transmit_nodes(int localval, int pause) int i; switch (fork()) { - case 0: - break; - case -1: - if (logging) - syslog(LOG_ERR, "netromt: fork: %m\n"); - return; - default: - return; + case 0: + break; + case -1: + if (logging) + syslog(LOG_ERR, "netromt: fork: %m\n"); + return; + default: + return; } dlen = ax25_aton("NODES", &dest); diff --git a/netrom/nodesave.c b/netrom/nodesave.c index 1258c36..ce6c106 100644 --- a/netrom/nodesave.c +++ b/netrom/nodesave.c @@ -40,17 +40,17 @@ int main(int argc, char **argv) while ((s = getopt(argc, argv, "p:v")) != -1) { switch (s) { - case 'p': - sprintf(buf, "%s/nrparms", optarg); - Nrparms = strdup(buf); - break; - case 'v': - printf("nodesave: %s\n", VERSION); - return 0; - case ':': - case '?': - fputs(Usage, stderr); - return 1; + case 'p': + sprintf(buf, "%s/nrparms", optarg); + Nrparms = strdup(buf); + break; + case 'v': + printf("nodesave: %s\n", VERSION); + return 0; + case ':': + case '?': + fputs(Usage, stderr); + return 1; } } diff --git a/netrom/nrattach.c b/netrom/nrattach.c index 87ff5aa..d2209aa 100644 --- a/netrom/nrattach.c +++ b/netrom/nrattach.c @@ -200,25 +200,25 @@ int main(int argc, char *argv[]) while ((fd = getopt(argc, argv, "i:m:v")) != -1) { switch (fd) { - case 'i': - if ((hp = gethostbyname(optarg)) == NULL) { - fprintf(stderr, "nrattach: invalid internet name/address - %s\n", optarg); - return 1; - } - break; - case 'm': - if ((mtu = atoi(optarg)) <= 0) { - fprintf(stderr, "nrattach: invalid mtu size - %s\n", optarg); - return 1; - } - break; - case 'v': - printf("nrattach: %s\n", VERSION); - return 0; - case ':': - case '?': - fprintf(stderr, "usage: nrattach [-i inetaddr] [-m mtu] [-v] port\n"); + case 'i': + if ((hp = gethostbyname(optarg)) == NULL) { + fprintf(stderr, "nrattach: invalid internet name/address - %s\n", optarg); return 1; + } + break; + case 'm': + if ((mtu = atoi(optarg)) <= 0) { + fprintf(stderr, "nrattach: invalid mtu size - %s\n", optarg); + return 1; + } + break; + case 'v': + printf("nrattach: %s\n", VERSION); + return 0; + case ':': + case '?': + fprintf(stderr, "usage: nrattach [-i inetaddr] [-m mtu] [-v] port\n"); + return 1; } } diff --git a/netrom/nrsdrv.c b/netrom/nrsdrv.c index 52ad0a4..d5979d2 100644 --- a/netrom/nrsdrv.c +++ b/netrom/nrsdrv.c @@ -136,14 +136,14 @@ static void nrs_esc(unsigned char *s, int len) while (len-- > 0) { switch (c = *s++) { - case STX: - case ETX: - case DLE: - *ptr++ = DLE; - /* Fall through */ - default: - *ptr++ = c; - break; + case STX: + case ETX: + case DLE: + *ptr++ = DLE; + /* Fall through */ + default: + *ptr++ = c; + break; } csum += c; @@ -170,17 +170,17 @@ static void kiss_esc(unsigned char *s, int len) while (len-- > 0) { switch (c = *s++) { - case FESC: - *ptr++ = FESC; - *ptr++ = FESCESC; - break; - case FEND: - *ptr++ = FESC; - *ptr++ = FESCEND; - break; - default: - *ptr++ = c; - break; + case FESC: + *ptr++ = FESC; + *ptr++ = FESCESC; + break; + case FEND: + *ptr++ = FESC; + *ptr++ = FESCEND; + break; + default: + *ptr++ = c; + break; } } @@ -195,50 +195,50 @@ static void nrs_unesc(unsigned char *buffer, int len) for (i = 0; i < len; i++) { switch (nrs_state) { - case NRS_WAIT: - if (buffer[i] == STX) { - nrs_state = NRS_DATA; - nrs_rxcount = 0; - nrs_cksum = 0; - } - break; + case NRS_WAIT: + if (buffer[i] == STX) { + nrs_state = NRS_DATA; + nrs_rxcount = 0; + nrs_cksum = 0; + } + break; - case NRS_DATA: - switch (buffer[i]) { - case STX: /* !! */ - nrs_rxcount = 0; - nrs_cksum = 0; - break; - case DLE: - nrs_state = NRS_ESCAPE; - break; - case ETX: - nrs_state = NRS_CKSUM; - break; - default: - if (nrs_rxcount < 512) { - nrs_cksum += buffer[i]; - nrs_rxbuffer[nrs_rxcount++] = buffer[i]; - } - break; - } + case NRS_DATA: + switch (buffer[i]) { + case STX: /* !! */ + nrs_rxcount = 0; + nrs_cksum = 0; break; - - case NRS_ESCAPE: - nrs_state = NRS_DATA; + case DLE: + nrs_state = NRS_ESCAPE; + break; + case ETX: + nrs_state = NRS_CKSUM; + break; + default: if (nrs_rxcount < 512) { nrs_cksum += buffer[i]; nrs_rxbuffer[nrs_rxcount++] = buffer[i]; } break; + } + break; - case NRS_CKSUM: - if (buffer[i] == nrs_cksum) - kiss_esc(nrs_rxbuffer, nrs_rxcount); - nrs_state = NRS_WAIT; - nrs_cksum = 0; - nrs_rxcount = 0; - break; + case NRS_ESCAPE: + nrs_state = NRS_DATA; + if (nrs_rxcount < 512) { + nrs_cksum += buffer[i]; + nrs_rxbuffer[nrs_rxcount++] = buffer[i]; + } + break; + + case NRS_CKSUM: + if (buffer[i] == nrs_cksum) + kiss_esc(nrs_rxbuffer, nrs_rxcount); + nrs_state = NRS_WAIT; + nrs_cksum = 0; + nrs_rxcount = 0; + break; } } } @@ -249,54 +249,54 @@ static void kiss_unesc(unsigned char *buffer, int len) for (i = 0; i < len; i++) { switch (kiss_state) { - case KISS_WAIT: - if (buffer[i] == FEND) { - kiss_state = KISS_CTRL; - kiss_rxcount = 0; - } - break; + case KISS_WAIT: + if (buffer[i] == FEND) { + kiss_state = KISS_CTRL; + kiss_rxcount = 0; + } + break; - case KISS_CTRL: - if ((buffer[i] & 0x0F) == 0x00) { - kiss_state = KISS_DATA; - kiss_rxcount = 0; - } else { - kiss_state = KISS_WAIT; - kiss_rxcount = 0; - } - break; + case KISS_CTRL: + if ((buffer[i] & 0x0F) == 0x00) { + kiss_state = KISS_DATA; + kiss_rxcount = 0; + } else { + kiss_state = KISS_WAIT; + kiss_rxcount = 0; + } + break; - case KISS_DATA: - switch (buffer[i]) { - case FEND: - if (kiss_rxcount > 2) - nrs_esc(kiss_rxbuffer, kiss_rxcount); - kiss_state = KISS_WAIT; - kiss_rxcount = 0; - break; - case FESC: - kiss_state = KISS_ESCAPE; - break; - default: - if (kiss_rxcount < 512) - kiss_rxbuffer[kiss_rxcount++] = buffer[i]; - break; - } + case KISS_DATA: + switch (buffer[i]) { + case FEND: + if (kiss_rxcount > 2) + nrs_esc(kiss_rxbuffer, kiss_rxcount); + kiss_state = KISS_WAIT; + kiss_rxcount = 0; + break; + case FESC: + kiss_state = KISS_ESCAPE; + break; + default: + if (kiss_rxcount < 512) + kiss_rxbuffer[kiss_rxcount++] = buffer[i]; break; + } + break; - case KISS_ESCAPE: - kiss_state = KISS_DATA; - switch (buffer[i]) { - case FESCESC: - if (kiss_rxcount < 512) - kiss_rxbuffer[kiss_rxcount++] = FESC; - break; - case FESCEND: - if (kiss_rxcount < 512) - kiss_rxbuffer[kiss_rxcount++] = FEND; - break; - } + case KISS_ESCAPE: + kiss_state = KISS_DATA; + switch (buffer[i]) { + case FESCESC: + if (kiss_rxcount < 512) + kiss_rxbuffer[kiss_rxcount++] = FESC; + break; + case FESCEND: + if (kiss_rxcount < 512) + kiss_rxbuffer[kiss_rxcount++] = FEND; break; + } + break; } } } @@ -310,28 +310,28 @@ int main(int argc, char *argv[]) while ((c = getopt(argc, argv, "dfls:v")) != -1) { switch (c) { - case 'd': - debugging = TRUE; - break; - case 'f': - flowcontrol = TRUE; - break; - case 'l': - logging = TRUE; - break; - case 's': - if ((speed = atoi(optarg)) <= 0) { - fprintf(stderr, "nrsdrv: invalid speed %s\n", optarg); - return 1; - } - break; - case 'v': - printf("kissattach: %s\n", VERSION); - return 0; - case ':': - case '?': - fprintf(stderr, "usage: nrsdrv [-f] [-l] [-s speed] [-v] kisstty nrstty\n"); + case 'd': + debugging = TRUE; + break; + case 'f': + flowcontrol = TRUE; + break; + case 'l': + logging = TRUE; + break; + case 's': + if ((speed = atoi(optarg)) <= 0) { + fprintf(stderr, "nrsdrv: invalid speed %s\n", optarg); return 1; + } + break; + case 'v': + printf("kissattach: %s\n", VERSION); + return 0; + case ':': + case '?': + fprintf(stderr, "usage: nrsdrv [-f] [-l] [-s speed] [-v] kisstty nrstty\n"); + return 1; } } -- cgit v1.2.3