diff options
Diffstat (limited to 'ax25ipd')
-rw-r--r-- | ax25ipd/ax25ipd.c | 8 | ||||
-rw-r--r-- | ax25ipd/ax25ipd.h | 30 | ||||
-rw-r--r-- | ax25ipd/bpqether.c | 9 | ||||
-rw-r--r-- | ax25ipd/config.c | 10 | ||||
-rw-r--r-- | ax25ipd/io.c | 27 | ||||
-rw-r--r-- | ax25ipd/process.c | 5 | ||||
-rw-r--r-- | ax25ipd/routing.c | 17 |
7 files changed, 52 insertions, 54 deletions
diff --git a/ax25ipd/ax25ipd.c b/ax25ipd/ax25ipd.c index f63eb91..74ae39e 100644 --- a/ax25ipd/ax25ipd.c +++ b/ax25ipd/ax25ipd.c @@ -11,10 +11,14 @@ * toolset in january 1997 by rob mayfield, vk5xxx/vk5zeu */ -#include <stdio.h> -#include <signal.h> +#include <limits.h> #include <setjmp.h> +#include <signal.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> #include <syslog.h> +#include <unistd.h> #include <netax25/daemon.h> #include <config.h> diff --git a/ax25ipd/ax25ipd.h b/ax25ipd/ax25ipd.h index cb48437..91314c4 100644 --- a/ax25ipd/ax25ipd.h +++ b/ax25ipd/ax25ipd.h @@ -40,35 +40,7 @@ #define IPPROTO_AX25 93 #define DEFAULT_UDP_PORT 10093 -/* local includes */ -#include "../pathnames.h" - -/* system includes */ -#include <ctype.h> -#include <errno.h> -#include <fcntl.h> -#include <memory.h> -#include <netdb.h> -#include <setjmp.h> -#include <signal.h> -#include <stdio.h> -#define __USE_XOPEN -#include <stdlib.h> -#include <string.h> -#include <unistd.h> -#include <limits.h> -#include <arpa/inet.h> -#include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/ip.h> -#include <netinet/ip_icmp.h> -#include <sys/ioctl.h> -#include <sys/socket.h> -#include <termio.h> -#include <sys/termios.h> -#include <sys/time.h> -#include <sys/types.h> -#include <netax25/daemon.h> +#include <limits.h> extern int udp_mode; /* true if we need a UDP socket */ extern int ip_mode; /* true if we need the raw IP socket */ diff --git a/ax25ipd/bpqether.c b/ax25ipd/bpqether.c index 21596ca..0b0b57f 100644 --- a/ax25ipd/bpqether.c +++ b/ax25ipd/bpqether.c @@ -5,16 +5,17 @@ * License: GPL */ -#include <sys/types.h> - #include <errno.h> #include <fcntl.h> +#include <limits.h> #include <stdio.h> +#include <string.h> +#include <syslog.h> +#include <unistd.h> #include <sys/ioctl.h> #include <sys/socket.h> #include <sys/stat.h> -#include <unistd.h> -#include <syslog.h> +#include <sys/types.h> #ifdef linux diff --git a/ax25ipd/config.c b/ax25ipd/config.c index e1a7f70..e0db591 100644 --- a/ax25ipd/config.c +++ b/ax25ipd/config.c @@ -12,17 +12,23 @@ */ #include <stdio.h> -#include <sys/types.h> -#include <netdb.h> +#include <stdlib.h> +#include <limits.h> #include <memory.h> +#include <netdb.h> #include <fcntl.h> #include <string.h> #include <ctype.h> +#include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> +#include <arpa/inet.h> #include <syslog.h> + #include "ax25ipd.h" +#include "../pathnames.h" + /* Initialize the config table */ void config_init(void) { diff --git a/ax25ipd/io.c b/ax25ipd/io.c index 1bc3377..e441131 100644 --- a/ax25ipd/io.c +++ b/ax25ipd/io.c @@ -9,24 +9,27 @@ * than just I/O stuff. */ -#include "ax25ipd.h" - -#include <sys/types.h> -#include <sys/time.h> -#include <time.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/ip.h> -#include <netdb.h> +#include <errno.h> #include <fcntl.h> #include <memory.h> +#include <netdb.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> -#include <errno.h> #include <syslog.h> - #include <termio.h> +#include <time.h> +#include <unistd.h> +#include <arpa/inet.h> +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> + +#include "ax25ipd.h" + static struct termio nterm; int ttyfd = -1; diff --git a/ax25ipd/process.c b/ax25ipd/process.c index 97faabb..098efc8 100644 --- a/ax25ipd/process.c +++ b/ax25ipd/process.c @@ -12,9 +12,12 @@ * Dual port additions by M.Durrant VE3PNX and D.J.Dionne Feb 4, 1995 */ -#include "ax25ipd.h" #include <stdio.h> +#include <string.h> #include <syslog.h> + +#include "ax25ipd.h" + /* if dual port the upper nibble will have a value of 1 (not 0) */ #define FROM_PORT2(p) (((*(p+1))&0x10)!=0) #define FOR_PORT2(p) (addrmatch(p,mycallsign2) || addrmatch(p,myalias2)) diff --git a/ax25ipd/routing.c b/ax25ipd/routing.c index 6fd5db4..6ac070a 100644 --- a/ax25ipd/routing.c +++ b/ax25ipd/routing.c @@ -6,12 +6,21 @@ * */ -#include <stdio.h> -#include "ax25ipd.h" -#include <sys/types.h> -#include <netinet/in.h> #include <memory.h> +#include <stdio.h> #include <syslog.h> +#include <arpa/inet.h> +#include <netinet/in.h> +#include <sys/types.h> + +#include "ax25ipd.h" + +#ifndef FALSE +#define FALSE 0 +#endif +#ifndef TRUE +#define TRUE 1 +#endif /* The routing table structure is not visible outside this module. */ |