diff options
Diffstat (limited to 'ax25rtd')
-rw-r--r-- | ax25rtd/Makefile.am | 2 | ||||
-rw-r--r-- | ax25rtd/README.ax25rtd | 28 | ||||
-rw-r--r-- | ax25rtd/ax25rtctl.c | 4 | ||||
-rw-r--r-- | ax25rtd/ax25rtd.c | 6 | ||||
-rw-r--r-- | ax25rtd/ax25rtd.conf.man | 20 | ||||
-rw-r--r-- | ax25rtd/ax25rtd.h | 12 | ||||
-rw-r--r-- | ax25rtd/ax25rtd.man | 8 | ||||
-rw-r--r-- | ax25rtd/config.c | 18 | ||||
-rw-r--r-- | ax25rtd/listener.c | 10 |
9 files changed, 54 insertions, 54 deletions
diff --git a/ax25rtd/Makefile.am b/ax25rtd/Makefile.am index ca67be2..5ca9c4c 100644 --- a/ax25rtd/Makefile.am +++ b/ax25rtd/Makefile.am @@ -87,4 +87,4 @@ AX25_SYSCONFDIR=$(sysconfdir)/ax25 AX25_LOCALSTATEDIR=$(localstatedir)/ax25 INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ - -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" + -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" diff --git a/ax25rtd/README.ax25rtd b/ax25rtd/README.ax25rtd index fe7a241..0c6a080 100644 --- a/ax25rtd/README.ax25rtd +++ b/ax25rtd/README.ax25rtd @@ -41,7 +41,7 @@ ipax0 dg1kjd-10 76800 256 7 IP-encap device * Klaus Kudielka (klaus.kudielka@ieee.org). * ***************************************************************** -Just a quick small README... +Just a quick small README... This will hopefully go into the man pages ASAP. Ax25routed @@ -53,7 +53,7 @@ This is a daemon that: - emulates the ceased "autorouter" of Linux Kernel AX.25 - sets up ARP entries automagically -- may adjust IP routes and encapsulation mode +- may adjust IP routes and encapsulation mode (although I really do not recomment to use this feature...) The "autorouter" is not really an autorouter. It just listens to the AX.25 @@ -90,7 +90,7 @@ ip-maxroutes 256 ax25-learn-routes no Set this to "yes", ax25rtd will add the routing information - for every heard frame (with complete digipeater path) to the + for every heard frame (with complete digipeater path) to the kernel AX.25 routing table. Note that ax25rtd's internal cache will be updated anyway, regardless of this option. @@ -120,16 +120,16 @@ ip-learn-routes no If set to "yes", ax25rtd will modify the IP routing table if it receives an IP frame (directed to us). This is dangerous! - It should not screw up your routing table, though. Ax25rtd - recognizes the netmask of the device and will adjust the route + It should not screw up your routing table, though. Ax25rtd + recognizes the netmask of the device and will adjust the route only if it fits the netmask and the old route points to one of the devices ax25rtd knows about (hence an AX.25 device). The problems begin if you have more than one port and a user - is able to hear your outgoing traffic on at least two of them. - Due to technical reasons ax25rtd adjusts the route _after_ the - kernel has sent the reply to the received TCP frame already. - This has technical reasons. + is able to hear your outgoing traffic on at least two of them. + Due to technical reasons ax25rtd adjusts the route _after_ the + kernel has sent the reply to the received TCP frame already. + This has technical reasons. If the remote does the same both are switching between the two ports. @@ -162,8 +162,8 @@ ip-adjust-mode no The problem with this option is that the kernel AX.25 sends a received IP frame to the IP layer regardless if it was - sent in UI frame encapsulation "mode datagram (dg)" or - in I frame encaps, hence in an AX.25 connection, "mode virtual + sent in UI frame encapsulation "mode datagram (dg)" or + in I frame encaps, hence in an AX.25 connection, "mode virtual connect (vc)". The Linux kernel will respond to this frame before ax25rtd can adjust the mode. If the remote does the same... You get the picture. @@ -172,7 +172,7 @@ ip-adjust-mode no arp-add no - This option, if set to "yes", changes the ARP table to the + This option, if set to "yes", changes the ARP table to the source callsign of the received frame. It should be harmless, just has the the effect that if it is a new entry, the Linux ARP code will send one ARP request before ax25rtd has adjust @@ -248,7 +248,7 @@ ax25rtctl -q ax25rtctl --version ax25rtctl -V - + Guess what... @@ -275,7 +275,7 @@ The commands recognized on this socket are: add ax25 <callsign> <dev> <time> [<digipeater>] Add an AX.25 route add ip <ip> <dev> <time> <call> <mode> - Add an IP route & mode + Add an IP route & mode del ax25 <callsign> <dev> Remove an AX.25 route from cache an kernel routing table diff --git a/ax25rtd/ax25rtctl.c b/ax25rtd/ax25rtctl.c index 95eb822..d7e82f0 100644 --- a/ax25rtd/ax25rtctl.c +++ b/ax25rtd/ax25rtctl.c @@ -133,7 +133,7 @@ static void list_ax25(void) printf("Callsign Port Last update Path\n"); /* - DB0PRA-15 scc3 Tue Aug 6 16:35:38 1996 + DB0PRA-15 scc3 Tue Aug 6 16:35:38 1996 */ while (1) { @@ -198,7 +198,7 @@ static void list_ip(void) offs = 0; printf("IP Address Port Callsign Mode Last update\n"); -/* +/* 255.255.255.255 scc3 DB0PRA-15 v Thu Jan 7 06:54:19 1971 */ while (1) { diff --git a/ax25rtd/ax25rtd.c b/ax25rtd/ax25rtd.c index b79a3b3..5a7dca1 100644 --- a/ax25rtd/ax25rtd.c +++ b/ax25rtd/ax25rtd.c @@ -19,9 +19,9 @@ /* * This daemon tries to learn AX.25, ARP, IP route entries by listening - * to the AX.25 traffic. It caches up to 256 entries (in "FIFO" mode) - * and saves the cache on demand or at shutdown in /var/ax25/ax25rtd/ip_routes - * and /var/ax25/ax25rtd/ax25_routes. The configuration file is + * to the AX.25 traffic. It caches up to 256 entries (in "FIFO" mode) + * and saves the cache on demand or at shutdown in /var/ax25/ax25rtd/ip_routes + * and /var/ax25/ax25rtd/ax25_routes. The configuration file is * /etc/ax25/ax25rtd.conf, you can almost everything configure * there. See ax25rtcl.c for runtime maintainance. * diff --git a/ax25rtd/ax25rtd.conf.man b/ax25rtd/ax25rtd.conf.man index 30741ca..9f085c7 100644 --- a/ax25rtd/ax25rtd.conf.man +++ b/ax25rtd/ax25rtd.conf.man @@ -50,7 +50,7 @@ anywhere else you may use the port or the device name. .TP ax25-learn-routes no Set this to "yes", @@@ax25rtd@@@ will add the routing information -for every heard frame (with complete digipeater path) to the +for every heard frame (with complete digipeater path) to the kernel AX.25 routing table. Note that @@@ax25rtd@@@'s internal cache will be updated anyway, regardless of this option. .TP @@ -76,16 +76,16 @@ ip-learn-routes no If set to "yes", @@@ax25rtd@@@ will modify the IP routing table if it receives an IP frame (directed to us). This is dangerous! -It should not screw up your routing table, though. @@@Ax25rtd@@@ -recognizes the netmask of the device and will adjust the route +It should not screw up your routing table, though. @@@Ax25rtd@@@ +recognizes the netmask of the device and will adjust the route only if it fits the netmask and the old route points to one of the devices @@@ax25rtd@@@ knows about (hence an AX.25 device). The problems begin if you have more than one port and a user -is able to hear your outgoing traffic on at least two of them. -Due to technical reasons @@@ax25rtd@@@ adjusts the route _after_ the -kernel has sent the reply to the received TCP frame already. -This has technical reasons. +is able to hear your outgoing traffic on at least two of them. +Due to technical reasons @@@ax25rtd@@@ adjusts the route _after_ the +kernel has sent the reply to the received TCP frame already. +This has technical reasons. If the remote does the same both are switching between the two ports. @@ -116,8 +116,8 @@ encapsulation mode according to the last received IP frame. The problem with this option is that the kernel AX.25 sends a received IP frame to the IP layer regardless if it was -sent in UI frame encapsulation "mode datagram (dg)" or -in I frame encaps, hence in an AX.25 connection, "mode virtual +sent in UI frame encapsulation "mode datagram (dg)" or +in I frame encaps, hence in an AX.25 connection, "mode virtual connect (vc)". The Linux kernel will respond to this frame before @@@ax25rtd@@@ can adjust the mode. If the remote does the same... You get the picture. @@ -125,7 +125,7 @@ same... You get the picture. Don't use this feature unless you know what you are doing. .TP arp-add no -This option, if set to "yes", changes the ARP table to the +This option, if set to "yes", changes the ARP table to the source callsign of the received frame. It should be harmless, just has the the effect that if it is a new entry, the Linux ARP code will send one ARP request before @@@ax25rtd@@@ has adjust diff --git a/ax25rtd/ax25rtd.h b/ax25rtd/ax25rtd.h index 83a1df5..4f09aae 100644 --- a/ax25rtd/ax25rtd.h +++ b/ax25rtd/ax25rtd.h @@ -16,9 +16,9 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ - + /* Defines for defaults */ - + #define IP_MAXROUTES 4096 #define AX25_MAXROUTES 4096 #define AX25_MAXCALLS 32 @@ -28,7 +28,7 @@ #define NEW_ARP 1 #define NEW_ROUTE 2 #define NEW_IPMODE 4 - + #define SEG_FIRST 0x80 #define SEG_REM 0x7F @@ -36,7 +36,7 @@ #define PID_ARP 0xCD #define PID_IP 0xCC #define PID_NETROM 0xCF - + #define HDLCAEB 0x01 #define SSSID_SPARE 0x40 #define AX25_REPEATED 0x80 @@ -95,10 +95,10 @@ typedef struct config_ { unsigned long netmask; unsigned long ip; - + int nmycalls; ax25_address mycalls[AX25_MAXCALLS]; - + struct full_sockaddr_ax25 ax25_default_path; } config; diff --git a/ax25rtd/ax25rtd.man b/ax25rtd/ax25rtd.man index 1f91815..c4ff577 100644 --- a/ax25rtd/ax25rtd.man +++ b/ax25rtd/ax25rtd.man @@ -12,7 +12,7 @@ is a daemon that: .br - sets up ARP entries automagically .br -- may adjust IP routes and encapsulation mode +- may adjust IP routes and encapsulation mode (although I really do not recomment to use this feature...) .LP The "autorouter" is not really an autorouter. It just listens to the AX.25 @@ -22,14 +22,14 @@ can be turned on or off by altering the configuration file .LP @@@Ax25rtd@@@ provides a socket /var/ax25/ax25rtd/control which is used for runtime maintainance through -.B @@@ax25rtctl@@@ +.B @@@ax25rtctl@@@ or to set up new routes by other daemons (a Flexnet router, perhaps?) .LP On startup @@@ax25rtd@@@ reads the configuration file and afterwards preloads the caches from the files /var/ax25/ax25rtd/ax25_routes and -/var/ax25/ax25rtd/ip_routes. On SIGTERM or -.B @@@ax25rtctl@@@ --save +/var/ax25/ax25rtd/ip_routes. On SIGTERM or +.B @@@ax25rtctl@@@ --save it saves the caches to those files. .SH FILES /etc/ax25/ax25rtd.conf diff --git a/ax25rtd/config.c b/ax25rtd/config.c index abc40b3..e328f56 100644 --- a/ax25rtd/config.c +++ b/ax25rtd/config.c @@ -512,7 +512,7 @@ void reload_config(void) /* commands: --------- - + add ax25 <callsign> <dev> <time> [<digipeater>] # Add an AX.25 route add ip <ip> <dev> <time> <call> <mode> # Add an IP route & mode del ax25 <callsign> <dev> # Remove an AX.25 route (from cache) @@ -522,20 +522,20 @@ void reload_config(void) save # Save cache expire <minutes> # Expire cache entries shutdown # Save cache and exit - + There's a difference between 'list heard' and 'heard': - - The 'list' commands will output the symbolic port names as defined in - /usr/local/etc/axports (i.e. 9k6 for scc3), while 'heard' shows the + + The 'list' commands will output the symbolic port names as defined in + /usr/local/etc/axports (i.e. 9k6 for scc3), while 'heard' shows the 'real' network device name (i.e. scc3). All commands accept either the port or the network device name. The expample - + add ax25 dl0tha scc3 0 db0pra - + is equivalent to - + add ax25 dl0tha 9k6 0 dbpra - + Note that in conflicting cases the network device name has precedence over the port name. */ diff --git a/ax25rtd/listener.c b/ax25rtd/listener.c index 27353e9..c3814a1 100644 --- a/ax25rtd/listener.c +++ b/ax25rtd/listener.c @@ -164,7 +164,7 @@ int set_arp(config * config, long ip, ax25_address * call) return 0; } -/* dl9sau: use iproute2 for advanced routing. +/* dl9sau: use iproute2 for advanced routing. * Anyone likes to implement this directly, without system()? */ #define RT_DEL 0 @@ -180,7 +180,7 @@ int iproute2(long ip, char *dev, int what) (int) ((ip & 0x0000FF00) >> 8), (int) ((ip & 0x00FF0000) >> 16), (int) ((ip & 0xFF000000) >> 24)); - + /* ip rule add table 44 */ sprintf(buffer, "/sbin/ip route %s %s dev %s table %s proto ax25rtd", (what ? "add" : "del"), ipa, dev, iproute2_table); @@ -413,7 +413,7 @@ void ax25_receive(int sock) data = buf; - /* + /* * KISS data? */ @@ -451,7 +451,7 @@ void ax25_receive(int sock) srccall.ax25_call[6] &= 0x1e; SKIP(ALEN); - /* + /* * How long is our control field? */ @@ -492,7 +492,7 @@ void ax25_receive(int sock) ctl &= ~LAPB_PF; } - /* + /* * Check if info frame and get PID */ |