From 904e050aa0f4250adc7b7f8125000ef26715abef Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 5 Jun 2013 00:57:41 +0200 Subject: Nuke trailing whitespace. Signed-off-by: Ralf Baechle --- ChangeLog | 10 +++++----- Makefile.am | 2 +- ax25-apps.spec.in | 2 +- ax25ipd/COPYING.ax25ipd | 10 +++++----- ax25ipd/HISTORY.ax25ipd | 4 ++-- ax25ipd/Makefile.am | 2 +- ax25ipd/README.ax25ipd | 42 +++++++++++++++++++++--------------------- ax25ipd/ax25ipd.conf | 2 +- ax25ipd/ax25ipd.h | 6 +++--- ax25ipd/bpqether.c | 6 +++--- ax25ipd/config.c | 2 +- ax25ipd/io.c | 2 +- ax25ipd/process.c | 4 ++-- ax25mond/Makefile.am | 2 +- ax25rtd/Makefile.am | 2 +- ax25rtd/README.ax25rtd | 28 ++++++++++++++-------------- ax25rtd/ax25rtctl.c | 4 ++-- ax25rtd/ax25rtd.c | 6 +++--- ax25rtd/ax25rtd.conf.man | 20 ++++++++++---------- ax25rtd/ax25rtd.h | 12 ++++++------ ax25rtd/ax25rtd.man | 8 ++++---- ax25rtd/config.c | 18 +++++++++--------- ax25rtd/listener.c | 10 +++++----- call/call.c | 4 ++-- call/call.h | 2 +- call/call.man | 4 ++-- call/menu.c | 2 +- call/yapp.c | 2 +- listen/ax25dump.c | 2 +- listen/listen.c | 2 +- listen/listen.h | 2 +- listen/listen.man | 6 +++--- listen/nrdump.c | 2 +- listen/opentracdump.c | 10 +++++----- 34 files changed, 121 insertions(+), 121 deletions(-) diff --git a/ChangeLog b/ChangeLog index b7c445e..a78432f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 + -- Craig Small -ax25-apps 0.0.4 +ax25-apps 0.0.4 * Added Tomi's patch so it correctly detects broken headers -- Craig Small 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