diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2015-05-02 00:19:09 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2015-05-02 00:19:09 +0200 |
| commit | 56e847dae8f585254c6b336ea557bd75a0574711 (patch) | |
| tree | 7e775ea62e06caa505e7ad017e17bbc0800d8ab3 /rose/rsuplnk.c | |
| parent | 62ceba5818d888041adbd466e8c67a8104bcf4fa (diff) | |
| parent | 67d85b3d5cf145a5bf0a1431d6052473b017daa9 (diff) | |
Merge branch 'master' of git://git.linux-ax25.org/pub/scm/ralf/ax25-tools
Conflicts:
ax25/axspawn.c
Diffstat (limited to 'rose/rsuplnk.c')
| -rw-r--r-- | rose/rsuplnk.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/rose/rsuplnk.c b/rose/rsuplnk.c index eadb0ed..fdc88ee 100644 --- a/rose/rsuplnk.c +++ b/rose/rsuplnk.c @@ -102,21 +102,21 @@ int main(int argc, char **argv) for (n = 0; n < ax25peer.fsa_ax25.sax25_ndigis; n++) { addr = ax25_ntoa(&ax25peer.fsa_digipeater[n]); - + if (strspn(addr, "0123456789-") == strlen(addr)) { if ((p = strchr(addr, '-')) != NULL) *p = '\0'; switch (strlen(addr)) { - case 4: - memcpy(rose_address + 0, addr, 4); - dnicindex = n; - break; - case 6: - memcpy(rose_address + 4, addr, 6); - addrindex = n; - break; - default: - break; + case 4: + memcpy(rose_address + 0, addr, 4); + dnicindex = n; + break; + case 6: + memcpy(rose_address + 4, addr, 6); + addrindex = n; + break; + default: + break; } } } @@ -208,18 +208,18 @@ int main(int argc, char **argv) */ if (connect(s, (struct sockaddr *)&roseconnect, addrlen) != 0) { switch (errno) { - case ECONNREFUSED: - strcpy(buffer, "*** Disconnected - 0100 - Number Busy\r"); - break; - case ENETUNREACH: - strcpy(buffer, "*** Disconnected - 0D00 - Not Obtainable\r"); - break; - case EINTR: - strcpy(buffer, "*** Disconnected - 3900 - Ship Absent\r"); - break; - default: - sprintf(buffer, "*** Disconnected - %d - %s\r", errno, strerror(errno)); - break; + case ECONNREFUSED: + strcpy(buffer, "*** Disconnected - 0100 - Number Busy\r"); + break; + case ENETUNREACH: + strcpy(buffer, "*** Disconnected - 0D00 - Not Obtainable\r"); + break; + case EINTR: + strcpy(buffer, "*** Disconnected - 3900 - Ship Absent\r"); + break; + default: + sprintf(buffer, "*** Disconnected - %d - %s\r", errno, strerror(errno)); + break; } close(s); @@ -249,7 +249,7 @@ int main(int argc, char **argv) FD_ZERO(&read_fd); FD_SET(STDIN_FILENO, &read_fd); FD_SET(s, &read_fd); - + select(s + 1, &read_fd, NULL, NULL, NULL); if (FD_ISSET(s, &read_fd)) { |