diff options
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | ax25-apps.spec.in | 2 | ||||
-rw-r--r-- | ax25ipd/COPYING.ax25ipd | 10 | ||||
-rw-r--r-- | ax25ipd/HISTORY.ax25ipd | 4 | ||||
-rw-r--r-- | ax25ipd/Makefile.am | 2 | ||||
-rw-r--r-- | ax25ipd/README.ax25ipd | 42 | ||||
-rw-r--r-- | ax25ipd/ax25ipd.conf | 2 | ||||
-rw-r--r-- | ax25ipd/ax25ipd.h | 6 | ||||
-rw-r--r-- | ax25ipd/bpqether.c | 6 | ||||
-rw-r--r-- | ax25ipd/config.c | 2 | ||||
-rw-r--r-- | ax25ipd/io.c | 2 | ||||
-rw-r--r-- | ax25ipd/process.c | 4 | ||||
-rw-r--r-- | ax25mond/Makefile.am | 2 | ||||
-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 | ||||
-rw-r--r-- | call/call.c | 4 | ||||
-rw-r--r-- | call/call.h | 2 | ||||
-rw-r--r-- | call/call.man | 4 | ||||
-rw-r--r-- | call/menu.c | 2 | ||||
-rw-r--r-- | call/yapp.c | 2 | ||||
-rw-r--r-- | listen/ax25dump.c | 2 | ||||
-rw-r--r-- | listen/listen.c | 2 | ||||
-rw-r--r-- | listen/listen.h | 2 | ||||
-rw-r--r-- | listen/listen.man | 6 | ||||
-rw-r--r-- | listen/nrdump.c | 2 | ||||
-rw-r--r-- | listen/opentracdump.c | 10 |
34 files changed, 121 insertions, 121 deletions
@@ -26,16 +26,16 @@ ax25-apps (0.0.5) * Patch from Hans to work better with newer GCCs * doc dirs are now relocatable * Added Jens patches - - Adapted ax25rtd to new kernel-ax25. ax25-learn-only-mine has - to be set to "true" for all interfaces to work right now. + - Adapted ax25rtd to new kernel-ax25. ax25-learn-only-mine has + to be set to "true" for all interfaces to work right now. Note that this is only a temporary solution. - - Made new-ax25-stack ready (listen, ax25rtd). Will still work + - Made new-ax25-stack ready (listen, ax25rtd). Will still work with old kernel-AX25 but need recompile. * New program, ax25mond - -- Craig Small <csmall@small.dropbear.id.au> + -- Craig Small <csmall@small.dropbear.id.au> -ax25-apps 0.0.4 +ax25-apps 0.0.4 * Added Tomi's patch so it correctly detects broken headers -- Craig Small <csmall@small.dropbear.id.au> Mon, 23 Aug 1999 11:45:46 +1000 diff --git a/Makefile.am b/Makefile.am index a3d3857..e83e5b8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,4 +9,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/ax25-apps.spec.in b/ax25-apps.spec.in index 8ed2ba4..04d4ce3 100644 --- a/ax25-apps.spec.in +++ b/ax25-apps.spec.in @@ -11,7 +11,7 @@ Source0: http://www.linux-ax25.org/pub/%{name}/%{name}-@VERSION@.tar.gz BuildRoot: %{_tmppath}/%{name}-@VERSION@-%{release}-root-%(%{__id_u} -n) %description -This package provides specific user applications for hamradio that use AX.25 +This package provides specific user applications for hamradio that use AX.25 Net/ROM or ROSE network protocols: * axcall: a general purpose AX.25, NET/ROM and ROSE connection program. diff --git a/ax25ipd/COPYING.ax25ipd b/ax25ipd/COPYING.ax25ipd index af122c9..ae99518 100644 --- a/ax25ipd/COPYING.ax25ipd +++ b/ax25ipd/COPYING.ax25ipd @@ -17,16 +17,16 @@ And an extract from the original README file. > Comments, Criticism, Enhancements, Problems, Bugs > ------------------------------------------------- -> +> > You can reach the person responsible for ax25ip at any of the following > addresses: -> +> > Mike.Westerhof@Central.Sun.COM -> +> > KA9WSB@WB9YAE -> +> > Mike Westerhof, 17 N Main St, Mt Prospect, IL 60056 -> +> > ------------------------------------------------------------------------- > Copyright 1991, Michael Westerhof, Sun Microsystems, Inc. > This software may be freely used, distributed, or modified, providing diff --git a/ax25ipd/HISTORY.ax25ipd b/ax25ipd/HISTORY.ax25ipd index 20a6339..d336b40 100644 --- a/ax25ipd/HISTORY.ax25ipd +++ b/ax25ipd/HISTORY.ax25ipd @@ -38,8 +38,8 @@ * 1.0.1 various cleanups and changes ... now called ax25ipd * added prototypes, fork's itself ... (vk5xxx) * - * 1.0.2 Incorporated patch allowing wildcarding of ax.25 callsigns. - * The old method required a route for every call/ssid + * 1.0.2 Incorporated patch allowing wildcarding of ax.25 callsigns. + * The old method required a route for every call/ssid * combination. (thanks to John Woolner. Wildcarding to be * enhanced later ... * diff --git a/ax25ipd/Makefile.am b/ax25ipd/Makefile.am index 1d20f98..6b06d8f 100644 --- a/ax25ipd/Makefile.am +++ b/ax25ipd/Makefile.am @@ -56,4 +56,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/ax25ipd/README.ax25ipd b/ax25ipd/README.ax25ipd index 0af2cce..bfc12d8 100644 --- a/ax25ipd/README.ax25ipd +++ b/ax25ipd/README.ax25ipd @@ -1,7 +1,7 @@ -** +** ** This file is a cobbling together of the various notes on ax25ipd. -** +** ax25ipd ======= @@ -30,10 +30,10 @@ run on BSD should not present too many issues, there has been no attempt to retain BSD(Sun) operability since it was updated in an environment where there was no access to BSD. - ax25ipd requires a serial port, and uses a raw socket to gain access -to the IP layer of the host's TCP/IP implementation (this requires that -ax25ipd be started by root). ax25ipd also supports using a standard UDP -socket in place of the raw socket, although this does not adhere to + ax25ipd requires a serial port, and uses a raw socket to gain access +to the IP layer of the host's TCP/IP implementation (this requires that +ax25ipd be started by root). ax25ipd also supports using a standard UDP +socket in place of the raw socket, although this does not adhere to RFC1226. @@ -96,7 +96,7 @@ myalias ILSUN beacon every 540 btext ax25ipd -- digi ka9wsb-7 -- Experimental IP encapsulator loglevel 2 -route W1AW-13 handbook.arrl.com +route W1AW-13 handbook.arrl.com route WZ9ZZZ last.one.edu param 1 20 @@ -160,7 +160,7 @@ using ax25ipd to carry AX.25 traffic. device /dev/ttya device /dev/ttya speed 9600 speed 1200 route W1AW-5 fish.sea.com route KA9WSB-3 one.two.com - + Using this setup, a user could run AX.25 connections between the two PCs. Note that while NOS can digipeat, NOS will not automatically allow users near W1AW-5 to digipeat through it to reach KA9WSB-3 (i.e. the command @@ -203,7 +203,7 @@ Sample Configuration - digi-to-digi device /dev/ttya device /dev/ttya speed 9600 speed 9600 route W1AW-5 fish.sea.com route KA9WSB-3 one.two.com - param 1 20 param 1 33 + param 1 20 param 1 33 In this setup, the UNIX hosts are "on the air". No PCs or additional hardware are required. A user near W1AW-5 could read a user near KA9WSB-3 @@ -214,9 +214,9 @@ would work just fine. --------- We have added dual port capibility in DIGI MODE ONLY to allow us to use it -with a Dataengine. Very little needed changing, but we did not document the +with a Dataengine. Very little needed changing, but we did not document the changes. If you really need to know, diff the package against the original, -which was/is at sunsite.unc.edu. To specify the second port, do something +which was/is at sunsite.unc.edu. To specify the second port, do something like this... #to use the second port, we need to be in digi mode @@ -226,19 +226,19 @@ mode digi mycall ve3djf-12 myalias vhfdjf # -#port 1 on my tnc goes to uhf. -#The callsign and alias must be different for this to work right... +#port 1 on my tnc goes to uhf. +#The callsign and alias must be different for this to work right... mycall2 ve3djf-13 myalias2 uhfdjf # -Everything else is the same. Note that if you leave out the mycall2 and +Everything else is the same. Note that if you leave out the mycall2 and myalias2 defines, it works just like the original in single port mode. For recieving on the KISS (dual) port, packets are checked against both callsigns -and aliases. Whoever is on the other end of the AXIP link can find out what -port it came from by looking at the who it got digi'd through, although -I can't think of any reason to do that... For transmiting, you go out the -port with the callsign matching the digi address. For example, to go out +and aliases. Whoever is on the other end of the AXIP link can find out what +port it came from by looking at the who it got digi'd through, although +I can't think of any reason to do that... For transmiting, you go out the +port with the callsign matching the digi address. For example, to go out port 0 in the above example, digi through ve3djf-12 or vhfdjf. To go out port 1, digi through ve3djf-13 or uhfdjf. @@ -246,11 +246,11 @@ Deficencies: If you specify the same callsign on both ports, no error is generated, but the way the logic in the code works you always go out the upper port (port 1), not port 0. In TNC mode, there is really no way to specify which port to transmit on that I can think of, so -there is no multiplexing there. Everything goes out port 0 in TNC mode +there is no multiplexing there. Everything goes out port 0 in TNC mode still. Lastly, none of the dump routines know anything about ports on the KISS interface, so they look the same, with both ports lumped into one. -Let us know if you like this hack, BTW. In retrospect, we should have +Let us know if you like this hack, BTW. In retrospect, we should have written a KISSPlexor (tm:-) HIHI. I think we will do that next. @@ -260,7 +260,7 @@ VE3DJF@bbs.VE3RPI.ampr.org AXIP (IP encapsulation of AX.25 frames) daemon by Michael Westerhof. - + diff --git a/ax25ipd/ax25ipd.conf b/ax25ipd/ax25ipd.conf index 1c7abf8..b3a59f0 100644 --- a/ax25ipd/ax25ipd.conf +++ b/ax25ipd/ax25ipd.conf @@ -52,7 +52,7 @@ mode tnc # will automaticaly take effekt. With Unix98 pty's, the slave tty name # could not be forseen. That's why ax25ipd will print the corresponding # slave pty name as a separate line on stdout. -# +# #device ampr device /dev/ttyp0 # diff --git a/ax25ipd/ax25ipd.h b/ax25ipd/ax25ipd.h index b088247..d683154 100644 --- a/ax25ipd/ax25ipd.h +++ b/ax25ipd/ax25ipd.h @@ -3,11 +3,11 @@ * Copyright 1991, Michael Westerhof, Sun Microsystems, Inc. * This software may be freely used, distributed, or modified, providing * this header is not removed. - * + * */ -/* - * Modifications added for dual port kiss TNC +/* + * Modifications added for dual port kiss TNC * by Michael Durrant VE3PNX and D. Jeff Dionne Feb 4, 1995 */ diff --git a/ax25ipd/bpqether.c b/ax25ipd/bpqether.c index 1c2805b..ba675de 100644 --- a/ax25ipd/bpqether.c +++ b/ax25ipd/bpqether.c @@ -68,7 +68,7 @@ int send_bpq(unsigned char *buf, int l) int offset = ETHERTAP_HEADER_LEN_MAX - ethertap_header_len; static const unsigned char ethernet_header[18] = { - 0x00, 0x00, 0x00, 0x02, /* ??? ??? ETH_P_AX25 (16bit) */ + 0x00, 0x00, 0x00, 0x02, /* ??? ??? ETH_P_AX25 (16bit) */ 0xfe, 0xfd, 0x00, 0x00, 0x00, 0x00, /* Destination address (kernel et hertap module) */ 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, /* Source address (WAMPES etherta @@ -161,7 +161,7 @@ static int tun_alloc(char *dev) #endif return fd; -} +} #endif /*---------------------------------------------------------------------------*/ @@ -176,7 +176,7 @@ int open_ethertap(char *ifname) int tuntap = 0; int mtu = 0; int skfd; - + strcpy(devname, "/dev/"); strncpy(devname + 5, ifname, sizeof(devname) - 5 -1); devname[sizeof(devname) -1] = 0; diff --git a/ax25ipd/config.c b/ax25ipd/config.c index 8d9405b..5b2c3e4 100644 --- a/ax25ipd/config.c +++ b/ax25ipd/config.c @@ -328,7 +328,7 @@ int parse_line(char *buf) * strange 10093. Even more, ax25ipd.conf's * examples for axip did not help - and the * manual is far from complete. - */ + */ if (uport == 0) uport = DEFAULT_UDP_PORT; q = strtok(NULL, " \t\n\r"); diff --git a/ax25ipd/io.c b/ax25ipd/io.c index a293d69..6d5fcd5 100644 --- a/ax25ipd/io.c +++ b/ax25ipd/io.c @@ -204,7 +204,7 @@ void io_open(void) perror("setting non-blocking I/O on tty device"); exit(1); } - + if (i_am_unix98_pty_master) { /* get name of pts-device */ if ((namepts = ptsname(ttyfd)) == NULL) { diff --git a/ax25ipd/process.c b/ax25ipd/process.c index 9508f0e..5717cd1 100644 --- a/ax25ipd/process.c +++ b/ax25ipd/process.c @@ -48,7 +48,7 @@ void process_init(void) * not include the CRC bytes. These are computed by this routine, and * it is expected that the buffer we have has room for the CRC bytes. * We will either dump this frame, or send it via the IP interface. - * + * * If we are in digi mode, we validate in several ways: * a) we must be the next digi in line to pick up the packet * b) the next site to get the packet (the next listed digi, or @@ -135,7 +135,7 @@ void from_kiss(unsigned char *buf, int l) * a pointer to an AX25 frame. * Note that the frame includes the CRC bytes, which we dump ASAP. * We will either dump this frame, or send it via the KISS interface. - * + * * If we are in digi mode, we only validate that: * a) we must be the next digi in line to pick up the packet * If we pass validation, we then set the digipeated bit for our entry diff --git a/ax25mond/Makefile.am b/ax25mond/Makefile.am index ecfc1d9..577cf9d 100644 --- a/ax25mond/Makefile.am +++ b/ax25mond/Makefile.am @@ -44,4 +44,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/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 */ diff --git a/call/call.c b/call/call.c index 21fb4f5..3404483 100644 --- a/call/call.c +++ b/call/call.c @@ -589,7 +589,7 @@ int start_ab_download(int mode, WINDOW ** swin, wint * wintab, for (namest = datest; namest < parmsbytes - 1 && (parms[namest - 1] != '#'); namest++); } - + if (!time_set) { time_t t = time(0); memcpy(&ft, localtime(&t), sizeof(struct tm)); @@ -2438,7 +2438,7 @@ int main(int argc, char **argv) break; } - + if (!be_silent) { printf("GW4PTS AX.25 Connect v1.11\n"); fflush(stdout); diff --git a/call/call.h b/call/call.h index bbc1fb4..b7723d7 100644 --- a/call/call.h +++ b/call/call.h @@ -2,7 +2,7 @@ #define FALSE 0 #endif #ifndef TRUE -#define TRUE 1 +#define TRUE 1 #endif extern int fd; extern int interrupted; diff --git a/call/call.man b/call/call.man index 85c291b..6fd5e5c 100644 --- a/call/call.man +++ b/call/call.man @@ -66,7 +66,7 @@ for normal (modulus 8) AX.25 operation, or for extended (modulus 128) AX.25 operation. .TP 10 .BI "\-p paclen" -Specify a specific maximum amount of data to be sent in each AX.25 packet. +Specify a specific maximum amount of data to be sent in each AX.25 packet. .TP 10 .BI "\-s mycall" Connect using the specified source @@@call@@@ (you may need to be root). @@ -154,7 +154,7 @@ Download a file (YAPP download) Suspend program .LP The program provides no terminal emulation features. These are left -up to the console facilities of the terminal in use. The program is +up to the console facilities of the terminal in use. The program is however '8 bit clean'. .SH FILES .nf diff --git a/call/menu.c b/call/menu.c index 285d936..ff42cba 100644 --- a/call/menu.c +++ b/call/menu.c @@ -1,5 +1,5 @@ /* - * menu (c)1995 Alexander Tietzel (DG6XA) + * menu (c)1995 Alexander Tietzel (DG6XA) * little Menu-System for use with ncurses * date activity autor * 22.07.1995 wininfo->wint (vector->single chain) Alexander Tietzel (DG6XA) diff --git a/call/yapp.c b/call/yapp.c index a8fda53..f96d604 100644 --- a/call/yapp.c +++ b/call/yapp.c @@ -5,7 +5,7 @@ * This module implements the YAPP file transfer protocol as defined by Jeff * Jacobsen WA7MBL in the files yappxfer.doc and yappxfer.pas. * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version diff --git a/listen/ax25dump.c b/listen/ax25dump.c index 5a870b7..6342dd4 100644 --- a/listen/ax25dump.c +++ b/listen/ax25dump.c @@ -297,7 +297,7 @@ void ax25_dump(unsigned char *data, int length, int hexdump) lprintf(T_AXHDR, "\n"); } else if ((type == SABM || type == UA) && length >= 2) { /* FlexNet transmits the QSO "handle" for header - * compression in SABM and UA frame data fields + * compression in SABM and UA frame data fields */ lprintf(T_AXHDR, " [%d]%s ", (data[0] << 8) | data[1], dama); diff --git a/listen/listen.c b/listen/listen.c index b7de1e3..04be3f1 100644 --- a/listen/listen.c +++ b/listen/listen.c @@ -51,7 +51,7 @@ void display_timestamp(void) timenow->tm_min, timenow->tm_sec); } -static void handle_sigint(int signal) +static void handle_sigint(int signal) { sigint++; close(sock); /* disturb blocking recvfrom */ diff --git a/listen/listen.h b/listen/listen.h index d484dc8..73a5d06 100644 --- a/listen/listen.h +++ b/listen/listen.h @@ -22,7 +22,7 @@ extern int ibmhack; /* IBM mapping? */ extern int timestamp; void display_timestamp(void); - + void lprintf(int dtype, char *fmt, ...); int initcolor(void); char *servname(int port, char *proto); diff --git a/listen/listen.man b/listen/listen.man index adc8dea..3a3d231 100644 --- a/listen/listen.man +++ b/listen/listen.man @@ -22,15 +22,15 @@ NET/ROM node polls are also displayed. .LP .B @@@Listen@@@ can use colors to make the output more readable. The ncurses library is used -to accomplish this. +to accomplish this. .B Color support defaults to being disabled, -and the +and the .BR -c parameter is used to enable it. .SH OPTIONS .TP 10 .BI \-8 -Indicates that the terminal is capable of printing 8-bit characters. This +Indicates that the terminal is capable of printing 8-bit characters. This parameter is required for the -i parameter to work. .TP 10 .BI \-a diff --git a/listen/nrdump.c b/listen/nrdump.c index 17c5b2f..c9fb0c1 100644 --- a/listen/nrdump.c +++ b/listen/nrdump.c @@ -42,7 +42,7 @@ static void netrom_inp_dump(unsigned char *data, int length) int tt; int alen; int i; - + if (data[0]==0xff) { lprintf(T_AXHDR, "INP Route Information Frame:\n"); i=1; diff --git a/listen/opentracdump.c b/listen/opentracdump.c index b4827f1..c0e7bdc 100644 --- a/listen/opentracdump.c +++ b/listen/opentracdump.c @@ -17,7 +17,7 @@ const char *units[]={"Volts","Amperes","Watts","Kelvins","Meters","Seconds", "Meters/Sec^2","Grays","Lumens","Cubic Meters/Second", "Pascal Seconds","Kilograms/Meter^3","Radians/Second^2","Coulombs", "Farads","Siemens","Count"}; - + unsigned char origin_call[7]; /* Who's talking */ unsigned char origin_ssid; unsigned char entity_call[7]; /* What they're talking about */ @@ -221,7 +221,7 @@ int decode_waypoint(unsigned char *element, int element_len) { strncpy(waypoint, element, element_len); waypoint[element_len] = 0; - lprintf(T_OPENTRAC, "Waypoint Name: %s\r\n", waypoint); + lprintf(T_OPENTRAC, "Waypoint Name: %s\r\n", waypoint); return 0; } @@ -315,7 +315,7 @@ int decode_acreg(unsigned char *element, int element_len) { strncpy(nnumber, element, element_len); nnumber[element_len]=0; lprintf(T_OPENTRAC, "Aircraft ID: %s\r\n", nnumber); - + return 0; } @@ -347,7 +347,7 @@ int decode_units(unsigned int unitnum, unsigned char *element, int element_len) double d; } *mval; int ival; /* too much variation in byte order and size for union */ - + if (unitnum > MAX_UNIT_INDEX) return -2; /* Invalid unit name */ mval = (void *)element; switch (element_len) { @@ -447,7 +447,7 @@ void opentrac_dump(unsigned char *data, int length, int hexdump) int elen; int etype; int decoded = 0; - + lprintf(T_PROTOCOL, "OpenTRAC decode (%d bytes):\r\n", length); strcpy(origin_call, "SENDER"); /* Listen doesn't tell us the sender */ origin_ssid = 0; |