Vincent Bernat [Wed, 14 Aug 2013 17:17:23 +0000 (19:17 +0200)]
lib: fix notification by reading one byte at a time from Unix socket
Internally, several bytes will be read at once and the notification
should be detected earlier. This fixes a regression introduced in 5aeda65433fd41b7bb67f908d8c4741f045ce508 because we relied on datagram
boundary semantics. This was not important when pulling information
but we still used this semantic when pushing information. Closes: #43.
Vincent Bernat [Tue, 13 Aug 2013 19:33:29 +0000 (21:33 +0200)]
lldpd: make notifications work when a port goes down
We need to refactor a bit `lldpd_remote_cleanup()` to separate the
expiration process (checking each remote port to check if it is still
current) and the removal of remote port (which triggers the expire
function because we want to be notified when a neighbor disappear this
way).
Vincent Bernat [Sun, 11 Aug 2013 20:07:57 +0000 (22:07 +0200)]
interfaces: abstract a bit MAC address mangling for bonding devices
A variable in `struct lldpd_hardware` control the mangling. On the
other end, `hardware->h_ops->send()` should not be called directly
anymore. Instead, `interfaces_helper_send()` should be used instead.
Vincent Bernat [Thu, 25 Jul 2013 08:24:30 +0000 (10:24 +0200)]
linux: mangle MAC address for enslaved devices
With enslaved devices, we may end up with in a situation where we send
a packet with a source MAC address that may confuse switches. For
example:
1. eth0, MAC X connected to switch A.
2. eth1, MAC Y connected to switch B.
3. Active/backup bond is created, MAC X.
4. eth1 is active, eth0 is backup.
If we use the real MAC, eth0 will send LLDP packets with MAC X to
switch A that will learn this MAC and send packets on backup port eth0
and they will be discarded.
The solution until then was to use a zero MAC address in those
cases. However, it seems that some switches may be confused by such a
move. See #26.
Instead, we set the "local" bit to 1 if not already set. Otherwise, we
just use some arbitrary MAC address that I have on an unused 3Com
"Tornado" card. It is unlikely to be reused (100 MBps and it is in a
basement). If you happen to have an even older MAC address and are
willing to give it for lldpd, feel free to tell me. The later case
does not handle all problems but allievate the problem with switches
discarding or complaining about zero MAC address as a source.
Vincent Bernat [Wed, 24 Jul 2013 20:20:50 +0000 (22:20 +0200)]
lib: introduce proper fixed point parsing and representation module
This additional modules isolates the complexity of parsing and
representing fixed point numbers. This is uses for coordinates in
LLDP-MED.
The previous version was using an incorrect precision. When parsing
user input, the precision is now derivated from the number of digits
provided. When displaying a value, the precision is used to add
additional 0 if needed.
Moreover, the previous version was a bit buggy with some values and
with negative numbers. This change contains unittest to tackle most
issues.
It relies on presence of __builtin_clzll() function, available in GCC
and others. Maybe this will become a portability issue.
Vincent Bernat [Mon, 15 Jul 2013 18:56:00 +0000 (20:56 +0200)]
event: replace `evutil_make_socket_nonblocking()` by an idempotent version
Once a file descriptor is locked with `BIOCLOCK`, it is not possible
to make it non-blocking. Therefore, we need to make it non-blocking
before locking it. Unfortunately, `evutil_make_socket_nonblocking()`
does not check the current value of the flag to see if there is
anything to do and we get a spurious warning. Just provide our version
of this function for this purpose.
Vincent Bernat [Fri, 12 Jul 2013 22:07:16 +0000 (00:07 +0200)]
configure: check for `res_init()` before trying other forms.
On OSX, `res_init()` is a symbol of `libsystem_info` (a dependency of
`libSystem`). So, AC_SEARCH_LIBS directly finds this symbol without an
additional library. However, once you include `resolv.h`, this becomes
a macro to `res_9_init` which is a symbol of `libresolv`. So you need
to link to `libresolv`. This is why we test first for `res_9_init` and
only after for `res_init`.
See more info about this here:
http://blog.achernya.com/2013/03/os-x-has-silly-libsystem.html
However, on other systems, this will link to libbind while this is not
needed because `res_9_init` is a symbol of libbind while `res_init` is
correctly defined in `libc` and no odd redefinition.
So, the solution is to force `AC_SEARCH_LIBS` to include `resolv.h`
and only test for `res_init` (as a symbol or a macro, we don't
care). This is done by redefining `AC_LANG_CALL(C)` to include
`resolv.h`.
Vincent Bernat [Thu, 11 Jul 2013 21:13:10 +0000 (23:13 +0200)]
priv: correctly declare `priv_cmd` type
`enum {} priv_cmd` was the declaration of a variable `priv_cmd` as an
anonymous enum. This is not what was expected. Instead, we want `enum
priv_cmd` to be a declaration of a named enum: `enum priv_cmd {}` (we
could also use `typedef enum {} priv_cmd`, but in lldpd, `typedef` is
seldomly used).
When `priv_cmd` was moved out of `priv.c`, its symbol was defined in
several objects. It seems that recent versions of gcc are able to cope
with that (because `priv_cmd` variable was not used, so it was
optimized out I think, not sure). However, some older versions like
4.2.1 complained about duplicate objects during the link phase.
Vincent Bernat [Tue, 2 Jul 2013 22:18:41 +0000 (00:18 +0200)]
interfaces: overwrite interface description with neighbor found
If no neighbor is found, interface name is `lldpd: no neighbor
found`. If one neighbor is found, this is `lldpd: connected to XXXXX`
and if several neighbors are found, this is `lldpd: XXX
neighbors`. Smart filter is used to count neighbors.
Currently, this is not possible to disable this. Works with FreeBSD,
OpenBSD and Linux.
Vincent Bernat [Tue, 2 Jul 2013 20:38:16 +0000 (22:38 +0200)]
privsep: separate OS specific code to dedicated files
Linux only stuff goes in `priv-linux.c`. This includes interface
handling, ethtool and ability to open files (which is not Linux
specific but only Linux requires this).
BSD stuff goes in `priv-bpf.c` since it only includes interface
handling.
Moreover, `privsep_fdpass.c` is merged into `privsep_io.c`, a new file
for almost everything about IO (read/write and passing FD). The global
`remote` object is put into this file.
This commit is mostly moving stuff around. This will enable the
ability to write interface aliases without putting too much #ifdef.
Vincent Bernat [Mon, 24 Jun 2013 23:25:04 +0000 (01:25 +0200)]
osx: don't try to build universal binaries
The use of multiple arch is not safe with autotools. I believe that
libevent compute some arch-dependent stuff at configure-time. Just say
in README.md that the package will only work for the same version of
OSX and the same architecture.
For the future:
- real universal binaries can be built by configuring and building
each arch into a separate directory, then merge the result with
`lipo`.
- building a package for an older versions of Max OS X can be done
by using `-mmacosx-version-min=10.6` and `-isysroot
/Developer/SDKs/MacOSX10.5.sdk` on both `CFLAGS` and `LDFLAGS`.
Vincent Bernat [Sun, 23 Jun 2013 21:26:05 +0000 (23:26 +0200)]
osx: add a target to build an OSX package
We use pkgbuild and productbuild (which seem to have superseded
PackageMaker). Those tools are shipped from OSX 10.6.6. There are only
a few examples of how to use those tools with daemons. You may also
look at Jenkins or ngircd.
See `README.md` for more information on how to invoke the build of a
package.
Vincent Bernat [Sun, 23 Jun 2013 12:26:53 +0000 (14:26 +0200)]
compat: include config.h in compat.h
Without this inclusion, no `HAVE_*` macro was defined. This was
triggered because with some libc, `strndup()` is defined by a macro
and therefore cannot be redefined as a function.
Vincent Bernat [Sat, 22 Jun 2013 10:15:47 +0000 (12:15 +0200)]
bpf: on OpenBSD, invert the filter direction
From the manual page:
> Sets or gets the status of the `direction filter` flag. If
> non-zero, packets matching the specified direction (either
> `BPF_DIRECTION_IN` or `BPF_DIRECTION_OUT`) will be ignored.
Vincent Bernat [Fri, 21 Jun 2013 00:55:50 +0000 (02:55 +0200)]
build: use libbsd if available, also use `setproctitle()`
The monitor process will be titled "monitor", while the unprivileged
one will have the number of neighbors displayed. We provide an empty
fallback since this function is not essential.
On Linux, we expect `setproctitle()` to be available in `libbsd`. This
makes functions like `strlcpy()` and `fgetln()` also
available. However, the headers are `bsd/string.h`, so we either need
to declare the prototype or include those new headers (or use the
overlay system). A simple thing to do is to detect the usage of libbsd
and include the appropriate headers in this case.
Vincent Bernat [Thu, 20 Jun 2013 22:58:51 +0000 (00:58 +0200)]
lldpcli: `configure system interface pattern` instead of `configure lldp iface-pattern`
`configure system` will contain non-LLDP related stuff. Moreover, we
may add `configure system interface alias rewrite` to enable the
rewrite of ifalias (a long awaited feature).
Roopa Prabhu [Sat, 8 Jun 2013 08:30:43 +0000 (10:30 +0200)]
Fixed some boundary conditions in code that cleans
remote ports on ttl expiry.
Problem:
- ttl expires, cleanup check fails to detect that ttl has elapsed
and skips cleanup
- After that, The ttl timer set routine again ends up setting the timer to ttl
resulting in 2 * ttl time for the expired rport to get released
liblldpctl: fix infinite loop when user is reading fixed chunks
ISSUE:
_lldpctl_do_something() has the following loop for receiving a complete
message:
while ((bytes_needed = ctl_msg_recv_unserialized(...)) > 0) {
_lldpctl_needs(bytes_needed)
}
ctl_msg_recv_unserialized() processes the received message and determines
how many more bytes are needed. First time, it requests "header" worth of
bytes. Once it receives that, it looks at header->len to determine next
set of bytes.
_lldpctl_needs() calls the connection's receive() routine to receive a
chunk of data and copies that over the a buffer in the connection structure,
either by malloc/copy or realloc/memmove. This buffer is called
conn->input_buffer. conn->input_buffer_len stores how many bytes are
currently in conn->input_buffer.
The issue is with the following statement in _lldpctl_needs():
if (conn->input_buffer_len >= length) return 0;
where length is bytes_needed in the above illustration.
Suppose the message requires 16578 bytes. The connection's receive()
routine provided by the application reads in chunks of 1024 bytes.
With the above logic, the loop will execute successfully for 16 times
with the following resultant state:
conn->input_buffer_len = 16384
bytes_needed = 194
The above conditional statement in the beginning of _lldpctl_needs()
will cause it to return 0. ctl_msg_recv_unserialized() will keep asking
for 194 more bytes. The while() loop goes ad infinitum.
Vincent Bernat [Thu, 6 Jun 2013 21:54:23 +0000 (23:54 +0200)]
marshal: fix alignment issue when unserializing
On some archs (Sparc and sometimes ARM), unaligned access are
forbidden. Instead of copying unaligned structures with `memcpy()`, we
ensure that `struct marshal_serialized` structures are always
correctly aligned, including when they are serialized. This is done by
adding some padding before appending such a structure to a buffer.
Vincent Bernat [Thu, 6 Jun 2013 20:48:42 +0000 (22:48 +0200)]
marshal: don't declare serialize/unserialize helper for string
When using convenience library, this may lead to multiple definition
of this function. We are better off not defining it and using
`marshal_unserialize()` in `client.c` instead.