Commit graph

1174 commits

Author SHA1 Message Date
Benjamin Cama
31fd6f1055 Remove the netlink code to get the tun if index.
It only worked for kernel >= 2.6.33. Use if_nametoindex() instead, which made
me include net/if.h in place of linux/if.h. Also, fix the RTM_SETLINK use which
should really be RTM_NEWLINK with correct parameters.

Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-08-19 19:23:27 +02:00
Benjamin Cama
19004791b6 Merge branch 'fdn-mods' 2011-08-17 17:23:38 +02:00
Benjamin Cama
ec7ce23c79 Merge branch 'use-netlink' into fdn-mods
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-08-17 17:23:07 +02:00
Benjamin Cama
1b372e5d46 Fix a stray comma, and replace existing routes.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-08-17 17:16:30 +02:00
Benjamin Cama
464a2bb072 Since 7c47438 we can remove math.h.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-08-17 02:28:33 +02:00
Benjamin Cama
1455a9c9bb Make routset()/route6set() use netlink.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-08-17 02:23:13 +02:00
Benjamin Cama
d02a243397 Route setting sockets don't exist anymore; remove them.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-08-17 02:22:01 +02:00
Benjamin Cama
3190b01ada Fix last commit on switching to CIDR.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-08-17 02:21:01 +02:00
Benjamin Cama
7c474381d4 Switch from masks to CIDR globally for IPv4.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-08-17 01:41:54 +02:00
Benjamin Cama
e6bf06aa1b Simplify route attribute appending.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-08-17 00:45:27 +02:00
Benjamin Cama
4344f5e9c7 Better tun device name length handling.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-08-17 00:23:25 +02:00
Benjamin Cama
8f944eeb21 Fix wrong rta type.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-08-16 19:04:08 +02:00
Benjamin Cama
1df1b625a8 netlink: Better error handling.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-08-16 18:45:53 +02:00
Benjamin Cama
7bdb42fe54 Add netlink fd polling.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-08-16 17:19:42 +02:00
Benjamin Cama
5cd5238b2f Remove all acknoledgement stuff. Still doesn't work.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-08-16 16:42:13 +02:00
Benjamin Cama
ba87a9d874 Commiting the rework I have done until now.
But I will remove the ack stuff, too complicated.

Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-08-16 16:06:33 +02:00
Benjamin Cama
c23922ce7c Netlink bugfixes.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-08-16 00:12:23 +02:00
Benjamin Cama
7aa8cc3dc0 Further netlink implementation. Not working yet.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-08-15 22:59:13 +02:00
Benjamin Cama
c7b02a0927 First netlink functions.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-08-14 22:56:35 +02:00
Benjamin Cama
4df9aef570 Merge branch 'fdn-mods' 2011-08-08 13:51:59 +02:00
Benjamin Cama
49f8ea66ee Don't process timers of disabled peers.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-08-08 13:51:32 +02:00
Benjamin Cama
7d862d168f Merge branch 'fdn-mods' 2011-08-08 13:43:42 +02:00
Benjamin Cama
500eb6e594 Check for expired timers even when receiving no events.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-08-08 13:43:02 +02:00
Benjamin Cama
6c503e49e5 Merge branch 'fdn-mods' 2011-08-08 00:35:29 +02:00
Benjamin Cama
ae7d3c9fca Merge branch 'rfc4760' into fdn-mods 2011-08-08 00:35:08 +02:00
Benjamin Cama
017a7d32fe Use the source IP we use as BGP router identifier.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-08-08 00:33:36 +02:00
Benjamin Cama
b320a99b8c Add a debian/changelog entry for version 2.2.1-1fdn1.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-07-29 15:07:08 +02:00
Benjamin Cama
08b8dffa78 Merge branch 'fdn-mods' 2011-07-29 14:54:00 +02:00
Benjamin Cama
1c898f7017 Merge branch 'rfc4760' into fdn-mods 2011-07-29 13:04:31 +02:00
Benjamin Cama
8c4f3bfe79 Add a config option to set the advertised BGP next hop.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-07-29 12:58:31 +02:00
Benjamin Cama
4f1a9aa378 Kill sessions receiving a ConfReq while closing.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-07-29 12:54:55 +02:00
Benjamin Cama
fd021320ec Add an "hostname" config option.
It is overridden by the -h command line option.

Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-07-29 12:54:54 +02:00
Benjamin Cama
3d9333a6cb Better example address for cli_bind_address.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-07-29 12:54:25 +02:00
Benjamin Cama
8321e71491 Add a cli_bind_address configuration option.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-07-29 12:54:25 +02:00
Benjamin Cama
d48de5fddd Stop BGP session even when we are master
Probably a bug; introduced by a patch that made only slaves stop their BGP
session.

Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-07-29 12:54:00 +02:00
Benjamin Cama
625794576e Wait before retrying on CEASE.
Using bgp_restart() floods the peer with connection requests. Use bgp_retry()
instead.

Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-07-29 12:54:00 +02:00
Benjamin Cama
b36141c0c7 Add an option to set source address for a BGP session.
When adding a BGP neighbour, one can set "update-source" (quagga syntax) to the
source IP address that will be used for that session.

Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-07-29 12:54:00 +02:00
Benjamin Cama
11ec3c4a24 Remove no more used plugin function names; fixes a crash.
These functions have been for long removed from plugins.h.
Debian sources used an older plugins.h.
l2tpns.c doesn't seem to have been ever fixed in upstream CVS.

Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-07-29 12:54:00 +02:00
Benjamin Cama
482ed7cbe5 Display session's remainging time in CLI.
Patch extracted from original Debian sources, not found in upstream CVS.

Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-07-29 12:54:00 +02:00
Benjamin Cama
cc806b225e Add a debian/changelog entry for version 2.2.1-1.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-07-28 18:18:08 +02:00
Benjamin Cama
fbd2194031 Merge branch 'upstream' 2011-07-28 17:59:33 +02:00
Benjamin Cama
21ae6221cf Retry on unsupported capability, not restart immediatly.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-07-28 15:01:58 +02:00
Benjamin Cama
60bd25ccdc Really fix parameters length calculation this time.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-07-28 15:01:58 +02:00
Benjamin Cama
e6fe57eec8 Fix a bug in parameters length setting.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-07-28 15:01:58 +02:00
Benjamin Cama
974d5f4408 A bit of renaming for clarity.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-07-28 15:01:58 +02:00
Benjamin Cama
350b06e6f4 Fix bugs in IPv6 update routine.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-07-28 15:01:58 +02:00
Benjamin Cama
7e1e91ef98 Call bgp_add/del_route6() in l2tpns.c.
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-07-28 15:01:57 +02:00
Benjamin Cama
c7e67e1de2 Don't send notification when receiving an unsupported capability.
Tested peer (quagga) doesn't interpret it nicely (i.e. it shuts the connection
down). Better not tell anything.

Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-07-28 15:01:57 +02:00
Benjamin Cama
3bd675ad2c Better check for IPv6 compatibility with the BGP peer.
We would advertise IPv6 routes to non-multiprotocol aware peers. Fix that.
Also, fix the way we parse options, to handle multiple optional parameters with
one capability in it (or many; it's just the way quagga send them).

Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-07-28 15:01:57 +02:00
Benjamin Cama
3ea85f7c57 Fix the AFI for IPv6.
The Address Family Identifier was not the one I thought it was.
Define it and fix its use for IPv6.

Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2011-07-28 15:01:57 +02:00