Commit Graph

45 Commits

Author SHA1 Message Date
marius
79b1899934 Add some missing newlines and static declarations.
MFC after:	3 days
2013-04-07 15:33:06 +00:00
glebius
7f832c3059 Retire struct sockaddr_inarp.
Since ARP and routing are separated, "proxy only" entries
don't have any meaning, thus we don't need additional field
in sockaddr to pass SIN_PROXY flag.

New kernel is binary compatible with old tools, since sizes
of sockaddr_inarp and sockaddr_in match, and sa_family are
filled with same value.

The structure declaration is left for compatibility with
third party software, but in tree code no longer use it.

Reviewed by:	ru, andre, net@
2013-01-31 08:55:21 +00:00
hrs
559bc2034e - Add IFT_L2VLAN (vlan(4)) support.
- Add -P option to support PID file.  When -a is specified /var/run/rarpd.pid
  is used, and when an interface is specified /var/run/rarpd.<ifname>.pid is
  used by default.
2012-07-09 08:11:16 +00:00
eadler
30bbed088a Fix warning when compiling with gcc46:
error: variable 'hostname' set but not used

Approved by:	dim, cperciva (mentor, blanket for pre-mentorship already-approved commits)
MFC after:	3 days
2012-01-20 01:37:23 +00:00
glebius
4d4fc1fa3d Catch up with kernel using time_uptime to drive ARP timeouts.
Noticed by:	jilles
2010-12-06 09:37:56 +00:00
imp
9fbed704d5 Per letter dated July 22, 1999 remove 3rd clause of Berkeley derived software
(with permission of addtional copyright holders where appropriate)
2004-08-07 04:28:56 +00:00
joerg
1c58fc2576 While walking over the list of interfaces obtained from getifaddrs(3),
rarpd clobbered any AF_INET information already configured for a given
interface name, so interfaces with more than one IP address made rarpd
listen only for the last address out of all IP aliases.

I changed this, so that AF_LINK information is always collected first
(to ensure the interface name gets its link-layer address associated),
but while looking for AF_INET addresses, the configuration is cloned
if there has already been one IP address seen for that interface name.

Thus, rarpd now effectively listens on all subnets.

MFC after:	1 week
2004-04-20 13:58:14 +00:00
joerg
fcb8a7d803 Fix a typo. 2004-04-20 13:26:52 +00:00
charnier
88ab3bade3 Make it clear that -a flag and interface parameter are mutually exclusive 2003-08-16 22:23:16 +00:00
mux
c0f84f3a1e Huge cleanup of the rarpd(8) code :
- Use getifaddrs() instead of rolling our own buggy one.  Previously,
  rarpd(8) would fail to see some interfaces because of a hardcoded limit.
  It now successfully sees any interface in the system, and this also makes
  the code _much_ simpler.
- Replace strncpy() calls with strlcpy() calls.  Some uses of strncpy()
  were bogus ; the code wasn't ensuring that the string was NUL terminated.
- Don't try to guard about select() FD_* macros being undefined.
- Use IF_NAMESIZE and ETHER_ADDR_LEN macros where appropriate.
- Add static keywords to function definitions for consistency, since
  the prototypes have it (I wonder why GCC didn't complain about this).
- Remove compat code for very old BSD versions and SunOS.
- Remove code for systems not having the dirent.h header.
- The code is now WARNS=5 clean so mark it as such.
- Don't add -DTFTP_DIR="/tftpboot" to the build command line since it's
  the default.

MFC after:	2 weeks
2003-07-11 14:13:21 +00:00
jmg
d23b391c61 make rarpd use in_addr_t instead of u_long since this is neccessary
on 64bit platforms

ok'd by: silence
2003-06-15 03:00:22 +00:00
obrien
7293a24a2b Use __FBSDID over rcsid[]. Protect copyright[] where needed. 2003-05-03 21:06:42 +00:00
dwmalone
fc1f61ef5f Add "-t" to useage message and comment. (The -t option was added
independently by Robert, but also proposed in the PR below).

PR:		38126
Submitted by:	Josh Elsasser <jre@vineyard.net>
MFC after:	1 month
2002-09-15 15:37:50 +00:00
roberto
b25a35b1f3 Fix buildworld breakage.
Submitted by:	Maxim Konovalov <maxim@macomnet.ru>
2002-05-09 14:15:57 +00:00
rwatson
6c8cb0765b o Allow rarpd to accept an additional '-t directory' argument, specifying
an alternative to /tftpboot.  This is useful it you're using tftpd
  with an alternative root (using -s), and would like rarpd to respond
  selectively to RARP requests using the same criteria as tftp.

Obtained from:	TrustedBSD Project
Sponsored by:	DARPA, NAI Labs
2001-11-16 16:49:21 +00:00
mjacob
f36634093c make it compile on alpha again 2001-07-05 16:53:49 +00:00
roam
90dc66d97b Add a -d command-line option; when used in conjunction with -f, rarpd
sends error messages to stderr, normal output to stdout, instead of
logging everything via syslog.

Turn off the FORMAT_AUDIT in the Makefile, until I can figure out how
to disable the check for one single line in the source :(

Reviewed by:	dd, silence on -audit
MFC after:	1 month
2001-06-18 06:48:33 +00:00
jlemon
6506d09c7b Comply with POSIX rules:
o Use %u for printing u_int.
    o Cast sizeof() to u_long, and print with %lu

Reviewed by: wollman
2001-06-16 18:55:13 +00:00
jlemon
f9ea867f51 Undo last braino and fix properly. 2001-06-16 06:40:03 +00:00
jlemon
8c2479e851 Fix warning:
489: warning: int format, different type arg (arg 4)
2001-06-16 06:37:04 +00:00
bde
6c940a5278 Fixed world breakage on systems where ntohl() doesn't return u_long
(e.g., on alphas, or even on i386's with a POSIX-200x-conformant
ntohl() (ntohl() returns uint32_t which is u_int on i386's)).

Fixed related bugs and bogons while I'm here:
- ntohl() was "fixed" for printing in 1 place by casting to
  "(unsigned int )".  This breaks the value on systems where u_int
  is smaller than uint32_t, and has 2 style bugs.
- spell u_int consistently (never use "unsigned").
- break K&R support some more (don't cast malloc()'s arg to a wrong
  type...).
2001-06-13 11:56:00 +00:00
roam
b0fb480052 WARNS=2 cleanup, ANSIfication, manpage mdoc(7) cleanup.
Once again, as explained in my messages to -audit, the ANSIfication comes
as part of the preparation to add a new -d command-line flag to send
output to stdout/stderr.  That commit will come in a week, pending any
further comments/objections.  For those who have missed the -audit mails,
it's at http://people.FreeBSD.org/~roam/bsd/rarpd/usr.sbin-rarpd-d.patch

Asbestos suit:	on ;)
Reviewed by:	dd, silence on -audit
MFC after:	1 month
2001-06-11 09:29:34 +00:00
charnier
b9ae470aef Remove incorrect section name. Incomplete -Wall cleaning. 1999-11-27 17:06:40 +00:00
peter
9751ab22ae Fix warning: return type of main' is not int' 1999-09-15 01:58:44 +00:00
peter
efabb9ccb1 $Id$ -> $FreeBSD$ 1999-08-28 01:35:59 +00:00
alex
f75a5f3e3b Sync usage string with reality: removed -n, added -s. 1998-12-06 16:31:47 +00:00
roberto
0835cba6a5 Fix bug in rarpd:
Explanation of the bug: when processing its first request, rarpd
     opens a routing socket to send requests to the arp table. It keeps
     that socket open afterwards, while waiting for new RARP requests.

     Meanwhile, the data received on the routing socket fill up until
     they are about 8Kbytes in size. Any additional data is lost.

     When rarpd receives its next RARP request, it tries to access the
     ARP table via a routing socket call, then waits for the answer to
     its own request. This answer is lost because the received data is
     already filled: when looking for the reply, rarpd receives only
     8kbytes worth of data, then loops waiting forever.

     Someone please test it on -STABLE and commit it. We can close the PR
     when testing on STABLE is done.

PR:		bin/5669
Submitted by:	Pierre Beyssac <pb@fasterix.freenix.org>
1998-04-02 13:20:15 +00:00
bde
1e40ca3634 Removed most unused includes of <net/if_var.h> outside the kernel. 1998-01-16 17:38:56 +00:00
charnier
f2b21f6a68 Mdoc'ify man page. 1997-10-13 11:03:36 +00:00
imp
691010efad compare return value from getopt against -1 rather than EOF, per the final
posix standard on the topic.
1997-03-31 05:11:47 +00:00
peter
b782f4df30 Revert $FreeBSD$ to $Id$ 1997-02-22 16:15:28 +00:00
jkh
808a36ef65 Make the long-awaited change from $Id$ to $FreeBSD$
This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
1997-01-14 07:20:47 +00:00
wollman
5972643f58 Update to match changes in <net/if.h>. 1997-01-03 20:19:50 +00:00
fenner
fa5c595ab7 Add -s flag to always supply mapping if known, ignoring the
presence or absence of files in /tftpboot.
1996-11-27 20:45:10 +00:00
fenner
c2f2394fba Make the man page reflect reality. Add BUGS section about DNS.
Logging cleanups (including logging the requestor's MAC address instead
 of the server's).
1996-11-27 20:42:09 +00:00
wpaul
ef41f18dde Although I got rarpd to work, it was largely through kludgery. Bill
Fenner was kind enough to point out the error of my ways. This incorporates
diffs from him which:

- Keep everything in network order.
- Log the booted ether & ip address, instead of my address on that net
- change several exit()'s to return()'s, so that rarpd continues running
  even if it thinks it's in a weird state.

One small tweak by me: in rarp_bootable(), we have to make sure to
construct 'ipname' in host byte order (if we don't, we have to
specify /tftpboot/<remote IP in hex> with <remote IP in hex> in
network byte order, which is confusing).

Also restored use of <dirent.h> rather than <sys/dir.h> as pointed
out by bde.

Also updated the man page so that the -v flag is documented.

With any luck, I won't have to touch this thing again.
1996-11-19 23:57:06 +00:00
wpaul
950b3f70b1 Dohw! Left out one important htonl() in update_arptab().
Pointed out by: Bill Fenner
1996-11-18 23:32:55 +00:00
wpaul
9c9a0ff114 Fix up new rarpd.
This includes the following changes:

- Support for poking ARP entries into the local table is now built
  in, so the arptab.c module I hacked together is no longer needed.

- rarp_process() and rarp_reply() now accept a len argument which is
  passed down from rarp_loop() which tells rarp_reply() exactly how
  long the original RARP frame was. (Usually, it's 60 bytes, which is
  the minimum.) Previously, the length was calculated using the sum
  of sizeof(struct ether_header) + sizeof(struct ether_arp) (plus the
  ethernet frame header, I think). The result was a total packet
  length of 42 bytes. Now, rarp_reply() sends out packets that are
  the same size as those it recieves (60 bytes). This agrees with the
  behavior of rarpd on SunOS (as observed with tcpdump). The unused
  extra bytes are zeroed.
1996-11-18 22:07:41 +00:00
bde
d2512c2bf9 Eliminated includes of the "temporary" backwards compatibility header
<sys/dir.h> in applications.  Maintained existing (inadequate) ifdefs
for dir.h vs dirent.h in libdialog, amd and rarpd, but didn't add any
new ones.
1996-09-24 08:08:11 +00:00
wpaul
48ad282fbc It appears that with FreeBSD-current, we need to set the ethernet
frame type in network byte order. The htons() that wasn't needed in
2.1 is now required in 2.2.

Ultimately, this rarpd should be replaced with the more recent one
supplied with the new BPF distribution.
1996-08-24 23:05:08 +00:00
wpaul
5cc8f19489 Use daemon() to deamonify ourselves. 1995-07-18 21:35:32 +00:00
rgrimes
4f960dd75f Remove trailing whitespace. 1995-05-30 03:57:47 +00:00
wpaul
0eb0d8c0e5 Get rid of ether_addr.c: it's been moved to libc. Also add proper
declaration for ether_ntohost(). (Does anyone know what header file
is supposed to contain the declarations for the ether_addr functions?
I can't them in the SunOS includes anywhere.)
1995-04-02 01:35:54 +00:00
wpaul
dfafbf1a37 Gave rarpd back the ability to poke temporary entries into the arp
table; arptab.c is really a hacked up version of arp.c that only
supports adding temporary entries. (This stuff is nasty -- I wish I
knew what was so wrong with SIOCSARP/SIOCGARP/etc... that made the
BSD developers decide to take it out.) The idea here is that the
client issuing the rarp is expected to be in the middle of booting
and would therefore be unable to answer arp queries from other machines
on the wire. Having rarpd stuff a temporary entry for the booting
host into the local arp table helps keep arp requests from going unanswered.

Also added ether_print() and ether_ntoa() to the ether_addr.c module.
Eventually I'll get ether_aton() and ether_hostton() written and
then this file can be dropped straight into libc. (Assuming no one
objects, of course. :)
1995-03-03 22:20:15 +00:00
wpaul
ec46f0f928 Obtained from: An old BPF release packaged with the tcpdump-2.0 source code.
"Yes Virginia, there is a rarpd."

(Before anyone asks, this *not* the rarpd from NetBSD. It did come from
the same place as theirs, however.)

This is a port of the rarpd program included with the tcpdump-2.0
source code (which I finally unearthed after scrounging around
some of the darker corners of the Internet). It's as close to the
original as I could keep it except for the following changes:

- The original program was based on an older version of the Berkeley
  Packet Filter which used different filter programming instructions.
  Fortunately, an updated RARP packet filter is available right in the
  BPF man page so this was easy to fix.

- The old code didn't know how to deal with variable length addresses
  in ifreq buffers. This has been fixed.

- Some byte order weirdness had to be fixed. The sanity checks in
  rarp_check() needed some htons()es, and the rarp_reply() function
  needed to properly set the ether_type field in the ethernet header
  to ETHERTYPE_REVARP before transmitting the packet, otherwise
  the bytes in ether_type would wind up reversed. It is important to note
  that using htons(ETHERTYPE_REVARP) will not work. This is odd, because
  the NetBSD rarpd uses htons(ETHERTYPE_REVARP). (Praise be to tcpdump:
  I would never have been able to track this silliness down without it.)

- The update_arptab() function has been castrated. It depends on
  SIOCSARP which has been deprecated in 4.4BSD. The NetBSD people
  don't seem to be using this function either. It wouldn't be too
  hard to replace this with equivalent code from arp.c, but it
  might not be necessary.

- I put together an ether_ntohost() support function that allows
  both local (/etc/ethers) and NIS lookups. This stuff should go
  in libc at some point, but nothing else seems to need it for now,
  so it can wait a while.

As you may have guessed, you need to have the Berkeley Packet Filter in
your kernel in order to use this program. The good news is that together
with the recently added bootparamd, you can use finally use a FreeBSD
box to boot Sun boxes over the network. (This was my whole motivation
for getting this stuff to work: I have this one subnet that has a whole
bunch of Sun3 X-terminals on it with only two Sun4 workstations, both
of which are locked in peoples' offices. If those two machines crash
(and they do every so often) then none of the X-terms will boot. Now I
can use a spare PC that I have as a boot server. :)
1995-03-02 06:41:40 +00:00