[Xorp-hackers] xorp svn VRRP centos

[Ben Greear]

On 02/24/2010 09:47 AM, Eric S. Johnson wrote:

> diff -ru xorp-svn-20100217.orig/fea/data_plane/ifconfig/ifconfig_set_netlink_socket.cc xorp-svn-20100217/fea/data_plane/ifconfig/ifconfig_set_netlink_socket.cc
> --- xorp-svn-20100217.orig/fea/data_plane/ifconfig/ifconfig_set_netlink_socket.cc       2010-02-17 10:25:17.000000000 -0500
> +++ xorp-svn-20100217/fea/data_plane/ifconfig/ifconfig_set_netlink_socket.cc    2010-02-24 10:27:49.000000000 -0500
> @@ -538,6 +538,8 @@
>       else
>          interface_flags&= ~IFF_UP;
>
> +// ESJ
> +#define HAVE_NETLINK_SOCKETS_SET_FLAGS_IS_BROKEN
>   #ifndef HAVE_NETLINK_SOCKETS_SET_FLAGS_IS_BROKEN
>       static const size_t        buffer_size = sizeof(struct nlmsghdr)
>          + sizeof(struct ifinfomsg) + 2*sizeof(struct rtattr) + 512;

Without this, does it fail to compile, or does it compile and just not work?

I'm hoping for some way to auto-detect what to do here either at run-time
or during scons configuration...

> diff -ru xorp-svn-20100217.orig/fea/data_plane/io/io_link_pcap.hh xorp-svn-20100217/fea/data_plane/io/io_link_pcap.hh
> --- xorp-svn-20100217.orig/fea/data_plane/io/io_link_pcap.hh    2010-02-17 10:25:18.000000000 -0500
> +++ xorp-svn-20100217/fea/data_plane/io/io_link_pcap.hh 2010-02-23 16:39:18.000000000 -0500
> @@ -34,6 +34,7 @@
>
>   #ifdef HAVE_PCAP_H
>   #include<pcap.h>
> +#define HAVE_PCAP
>   #endif

I don't see any reason to have the HAVE_PCAP define...I'm going to change all checks to
HAVE_PCAP_H so that this hack isn't needed.

I'm attaching my version of your changes.  Assuming the allconfig.py detection
for mcast works, I'll go ahead and push this into my tree.

Thanks,
Ben


-- 
Ben Greear <greearb at candelatech.com>
Candela Technologies Inc  http://www.candelatech.com

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: xorp.patch
Url: http://mailman.ICSI.Berkeley.EDU/pipermail/xorp-hackers/attachments/20100224/39185a8e/attachment.ksh