[Xorp-cvs] XORP cvs commit: xorp/fea xorp/fea/tools

Bruce Simpson bms@icir.org
Thu, 18 Aug 2005 15:45:56 GMT


CVSROOT:	/usr/local/www/data/cvs
Module name:	xorp
Changes by:	bms@xorpc.icir.org	2005-08-18 15:45:56 UTC

XORP CVS repository


Modified files:
	fea           Makefile.am Makefile.in click_socket.cc 
	              click_socket.hh fea.cc fte.hh fticonfig.cc 
	              fticonfig.hh fticonfig_entry_get.cc 
	              fticonfig_entry_get.hh fticonfig_entry_get_dummy.cc 
	              fticonfig_entry_get_iphelper.cc 
	              fticonfig_entry_get_rtsock.cc 
	              fticonfig_entry_observer.hh 
	              fticonfig_entry_observer_dummy.cc 
	              fticonfig_entry_observer_iphelper.cc 
	              fticonfig_entry_parse_rtm.cc fticonfig_entry_set.hh 
	              fticonfig_entry_set_dummy.cc 
	              fticonfig_entry_set_iphelper.cc 
	              fticonfig_entry_set_netlink.cc 
	              fticonfig_entry_set_rtsock.cc 
	              fticonfig_table_get.cc fticonfig_table_get.hh 
	              fticonfig_table_get_dummy.cc 
	              fticonfig_table_get_iphelper.cc 
	              fticonfig_table_observer.hh 
	              fticonfig_table_observer_dummy.cc 
	              fticonfig_table_observer_iphelper.cc 
	              fticonfig_table_parse_rtm.cc fticonfig_table_set.hh 
	              fticonfig_table_set_dummy.cc 
	              fticonfig_table_set_iphelper.cc ifconfig.cc 
	              ifconfig.hh ifconfig_get.cc ifconfig_get.hh 
	              ifconfig_get_dummy.cc ifconfig_get_ioctl.cc 
	              ifconfig_get_iphelper.cc ifconfig_get_netlink.cc 
	              ifconfig_get_proc_linux.cc ifconfig_get_sysctl.cc 
	              ifconfig_observer.hh ifconfig_observer_dummy.cc 
	              ifconfig_observer_iphelper.cc 
	              ifconfig_parse_ifaddrs.cc ifconfig_parse_ifreq.cc 
	              ifconfig_parse_nlm.cc ifconfig_parse_rtm.cc 
	              ifconfig_set.cc ifconfig_set.hh 
	              ifconfig_set_click.cc ifconfig_set_dummy.cc 
	              ifconfig_set_ioctl.cc ifconfig_set_iphelper.cc 
	              ifconfig_set_netlink.cc ifmanager_transaction.hh 
	              iftree.cc iftree.hh ip.h libfeaclient_bridge.cc 
	              mfea_config.cc mfea_mrouter.cc mfea_mrouter.hh 
	              mfea_node.cc mfea_node.hh mfea_node_cli.cc 
	              mfea_osdep.hh mfea_proto_comm.cc mfea_proto_comm.hh 
	              netlink_socket.cc netlink_socket.hh 
	              netlink_socket_utils.cc pa_backend_ipfw2.cc 
	              pa_transaction.cc rawsock4.cc rawsock4.hh 
	              rawsock6.cc rawsock6.hh routing_socket.cc 
	              routing_socket.hh routing_socket_utils.cc 
	              test_add_route.sh test_config_interface.sh 
	              test_ifconfig_rtsock.cc 
	              test_ifmanager_transaction.cc test_mfea.cc 
	              test_rawsock4.cc test_xrl_sockets4_udp.cc 
	              test_xrl_sockets4_udp.sh test_xrls.sh 
	              xrl_mfea_node.cc xrl_mfea_node.hh xrl_packet_acl.cc 
	              xrl_rawsock4.cc xrl_rawsock6.cc xrl_socket_cmds.cc 
	              xrl_socket_server.cc xrl_socket_server.hh 
	              xrl_target.cc 
	fea/tools     show_interfaces.cc 

Log message:
	XORP/Win32 merge to mainline.
	 Use libcomm where possible.
	 Use XorpFd for file descriptors.
	 Use IoEvents, not Selectors.
	 Use header file guards to enable multicast and IPv6 related
	 low level code to build under Windows.
	 Use XORP_SOCKOPT_CAST(), XORP_BUF_CAST(), XORP_INT_CAST(),
	 and XORP_UINT_CAST() where needed for Winsock compatibility.
	 Bring in the lower layer classes which use the IP Helper API
	 to manage routes and interfaces under Windows into the build.
	 Regen.
	
	 [Note that the IP Helper based FEA does not currently support
	  point-to-point interfaces correctly. This is a known issue
	  with Windows; the endpoint address can't easily be discovered;
	  see OpenVPN forums for further info.]

Revision  Changes                                  Path
1.62      +10 -1;  commitid: 162954304acff7ea6;    xorp/fea/Makefile.am
1.77      +39 -15;  commitid: 162954304acff7ea6;   xorp/fea/Makefile.in
1.23      +92 -25;  commitid: 162954304acff7ea6;   xorp/fea/click_socket.cc
1.19      +7 -7;  commitid: 162954304acff7ea6;     xorp/fea/click_socket.hh
1.50      +11 -1;  commitid: 162954304acff7ea6;    xorp/fea/fea.cc
1.17      +3 -2;  commitid: 162954304acff7ea6;     xorp/fea/fte.hh
1.42      +112 -8;  commitid: 162954304acff7ea6;   xorp/fea/fticonfig.cc
1.35      +16 -1;  commitid: 162954304acff7ea6;    xorp/fea/fticonfig.hh
1.9       +5 -3;  commitid: 162954304acff7ea6;     xorp/fea/fticonfig_entry_get.cc
1.23      +84 -1;  commitid: 162954304acff7ea6;    xorp/fea/fticonfig_entry_get.hh
1.13      +2 -2;  commitid: 162954304acff7ea6;     xorp/fea/fticonfig_entry_get_dummy.cc
1.2       +0 -0;  commitid: 162954304acff7ea6;     xorp/fea/fticonfig_entry_get_iphelper.cc
1.29      +4 -1;  commitid: 162954304acff7ea6;     xorp/fea/fticonfig_entry_get_rtsock.cc
1.14      +31 -1;  commitid: 162954304acff7ea6;    xorp/fea/fticonfig_entry_observer.hh
1.10      +2 -2;  commitid: 162954304acff7ea6;     xorp/fea/fticonfig_entry_observer_dummy.cc
1.2       +0 -0;  commitid: 162954304acff7ea6;     xorp/fea/fticonfig_entry_observer_iphelper.cc
1.11      +3 -1;  commitid: 162954304acff7ea6;     xorp/fea/fticonfig_entry_parse_rtm.cc
1.20      +66 -1;  commitid: 162954304acff7ea6;    xorp/fea/fticonfig_entry_set.hh
1.11      +2 -2;  commitid: 162954304acff7ea6;     xorp/fea/fticonfig_entry_set_dummy.cc
1.2       +0 -0;  commitid: 162954304acff7ea6;     xorp/fea/fticonfig_entry_set_iphelper.cc
1.24      +5 -5;  commitid: 162954304acff7ea6;     xorp/fea/fticonfig_entry_set_netlink.cc
1.31      +3 -1;  commitid: 162954304acff7ea6;     xorp/fea/fticonfig_entry_set_rtsock.cc
1.9       +5 -3;  commitid: 162954304acff7ea6;     xorp/fea/fticonfig_table_get.cc
1.20      +46 -1;  commitid: 162954304acff7ea6;    xorp/fea/fticonfig_table_get.hh
1.11      +2 -2;  commitid: 162954304acff7ea6;     xorp/fea/fticonfig_table_get_dummy.cc
1.2       +0 -0;  commitid: 162954304acff7ea6;     xorp/fea/fticonfig_table_get_iphelper.cc
1.15      +31 -1;  commitid: 162954304acff7ea6;    xorp/fea/fticonfig_table_observer.hh
1.10      +2 -2;  commitid: 162954304acff7ea6;     xorp/fea/fticonfig_table_observer_dummy.cc
1.2       +0 -0;  commitid: 162954304acff7ea6;     xorp/fea/fticonfig_table_observer_iphelper.cc
1.14      +3 -1;  commitid: 162954304acff7ea6;     xorp/fea/fticonfig_table_parse_rtm.cc
1.16      +59 -1;  commitid: 162954304acff7ea6;    xorp/fea/fticonfig_table_set.hh
1.10      +2 -2;  commitid: 162954304acff7ea6;     xorp/fea/fticonfig_table_set_dummy.cc
1.2       +0 -0;  commitid: 162954304acff7ea6;     xorp/fea/fticonfig_table_set_iphelper.cc
1.46      +15 -7;  commitid: 162954304acff7ea6;    xorp/fea/ifconfig.cc
1.44      +4 -1;  commitid: 162954304acff7ea6;     xorp/fea/ifconfig.hh
1.10      +7 -3;  commitid: 162954304acff7ea6;     xorp/fea/ifconfig_get.cc
1.21      +34 -1;  commitid: 162954304acff7ea6;    xorp/fea/ifconfig_get.hh
1.11      +2 -2;  commitid: 162954304acff7ea6;     xorp/fea/ifconfig_get_dummy.cc
1.14      +9 -6;  commitid: 162954304acff7ea6;     xorp/fea/ifconfig_get_ioctl.cc
1.2       +0 -0;  commitid: 162954304acff7ea6;     xorp/fea/ifconfig_get_iphelper.cc
1.16      +7 -7;  commitid: 162954304acff7ea6;     xorp/fea/ifconfig_get_netlink.cc
1.22      +4 -3;  commitid: 162954304acff7ea6;     xorp/fea/ifconfig_get_proc_linux.cc
1.12      +3 -1;  commitid: 162954304acff7ea6;     xorp/fea/ifconfig_get_sysctl.cc
1.14      +31 -1;  commitid: 162954304acff7ea6;    xorp/fea/ifconfig_observer.hh
1.10      +2 -2;  commitid: 162954304acff7ea6;     xorp/fea/ifconfig_observer_dummy.cc
1.2       +0 -0;  commitid: 162954304acff7ea6;     xorp/fea/ifconfig_observer_iphelper.cc
1.24      +6 -4;  commitid: 162954304acff7ea6;     xorp/fea/ifconfig_parse_ifaddrs.cc
1.24      +20 -2;  commitid: 162954304acff7ea6;    xorp/fea/ifconfig_parse_ifreq.cc
1.19      +6 -4;  commitid: 162954304acff7ea6;     xorp/fea/ifconfig_parse_nlm.cc
1.24      +8 -1;  commitid: 162954304acff7ea6;     xorp/fea/ifconfig_parse_rtm.cc
1.28      +11 -8;  commitid: 162954304acff7ea6;    xorp/fea/ifconfig_set.cc
1.38      +148 -44;  commitid: 162954304acff7ea6;  xorp/fea/ifconfig_set.hh
1.27      +27 -19;  commitid: 162954304acff7ea6;   xorp/fea/ifconfig_set_click.cc
1.21      +18 -15;  commitid: 162954304acff7ea6;   xorp/fea/ifconfig_set_dummy.cc
1.38      +118 -52;  commitid: 162954304acff7ea6;  xorp/fea/ifconfig_set_ioctl.cc
1.2       +0 -0;  commitid: 162954304acff7ea6;     xorp/fea/ifconfig_set_iphelper.cc
1.23      +31 -26;  commitid: 162954304acff7ea6;   xorp/fea/ifconfig_set_netlink.cc
1.11      +15 -9;  commitid: 162954304acff7ea6;    xorp/fea/ifmanager_transaction.hh
1.28      +7 -5;  commitid: 162954304acff7ea6;     xorp/fea/iftree.cc
1.29      +7 -7;  commitid: 162954304acff7ea6;     xorp/fea/iftree.hh
1.2       +0 -0;  commitid: 162954304acff7ea6;     xorp/fea/ip.h
1.15      +8 -5;  commitid: 162954304acff7ea6;     xorp/fea/libfeaclient_bridge.cc
1.13      +3 -3;  commitid: 162954304acff7ea6;     xorp/fea/mfea_config.cc
1.32      +235 -69;  commitid: 162954304acff7ea6;  xorp/fea/mfea_mrouter.cc
1.11      +15 -11;  commitid: 162954304acff7ea6;   xorp/fea/mfea_mrouter.hh
1.56      +16 -16;  commitid: 162954304acff7ea6;   xorp/fea/mfea_node.cc
1.32      +15 -15;  commitid: 162954304acff7ea6;   xorp/fea/mfea_node.hh
1.17      +7 -5;  commitid: 162954304acff7ea6;     xorp/fea/mfea_node_cli.cc
1.7       +7 -2;  commitid: 162954304acff7ea6;     xorp/fea/mfea_osdep.hh
1.33      +132 -51;  commitid: 162954304acff7ea6;  xorp/fea/mfea_proto_comm.cc
1.12      +15 -11;  commitid: 162954304acff7ea6;   xorp/fea/mfea_proto_comm.hh
1.32      +18 -8;  commitid: 162954304acff7ea6;    xorp/fea/netlink_socket.cc
1.16      +2 -2;  commitid: 162954304acff7ea6;     xorp/fea/netlink_socket.hh
1.26      +4 -4;  commitid: 162954304acff7ea6;     xorp/fea/netlink_socket_utils.cc
1.6       +20 -3;  commitid: 162954304acff7ea6;    xorp/fea/pa_backend_ipfw2.cc
1.8       +3 -3;  commitid: 162954304acff7ea6;     xorp/fea/pa_transaction.cc
1.14      +67 -30;  commitid: 162954304acff7ea6;   xorp/fea/rawsock4.cc
1.9       +3 -3;  commitid: 162954304acff7ea6;     xorp/fea/rawsock4.hh
1.13      +153 -28;  commitid: 162954304acff7ea6;  xorp/fea/rawsock6.cc
1.10      +3 -3;  commitid: 162954304acff7ea6;     xorp/fea/rawsock6.hh
1.24      +19 -9;  commitid: 162954304acff7ea6;    xorp/fea/routing_socket.cc
1.13      +2 -2;  commitid: 162954304acff7ea6;     xorp/fea/routing_socket.hh
1.28      +6 -1;  commitid: 162954304acff7ea6;     xorp/fea/routing_socket_utils.cc
1.22      +6 -1;  commitid: 162954304acff7ea6;     xorp/fea/test_add_route.sh
1.17      +13 -1;  commitid: 162954304acff7ea6;    xorp/fea/test_config_interface.sh
1.9       +24 -10;  commitid: 162954304acff7ea6;   xorp/fea/test_ifconfig_rtsock.cc
1.7       +5 -1;  commitid: 162954304acff7ea6;     xorp/fea/test_ifmanager_transaction.cc
1.23      +4 -1;  commitid: 162954304acff7ea6;     xorp/fea/test_mfea.cc
1.13      +60 -11;  commitid: 162954304acff7ea6;   xorp/fea/test_rawsock4.cc
1.11      +11 -5;  commitid: 162954304acff7ea6;    xorp/fea/test_xrl_sockets4_udp.cc
1.4       +1 -3;  commitid: 162954304acff7ea6;     xorp/fea/test_xrl_sockets4_udp.sh
1.3       +2 -2;  commitid: 162954304acff7ea6;     xorp/fea/test_xrls.sh
1.13      +9 -1;  commitid: 162954304acff7ea6;     xorp/fea/tools/show_interfaces.cc
1.46      +82 -61;  commitid: 162954304acff7ea6;   xorp/fea/xrl_mfea_node.cc
1.24      +4 -4;  commitid: 162954304acff7ea6;     xorp/fea/xrl_mfea_node.hh
1.4       +3 -2;  commitid: 162954304acff7ea6;     xorp/fea/xrl_packet_acl.cc
1.15      +26 -12;  commitid: 162954304acff7ea6;   xorp/fea/xrl_rawsock4.cc
1.6       +17 -8;  commitid: 162954304acff7ea6;    xorp/fea/xrl_rawsock6.cc
1.6       +3 -2;  commitid: 162954304acff7ea6;     xorp/fea/xrl_socket_cmds.cc
1.25      +116 -74;  commitid: 162954304acff7ea6;  xorp/fea/xrl_socket_server.cc
1.10      +6 -6;  commitid: 162954304acff7ea6;     xorp/fea/xrl_socket_server.hh
1.73      +5 -5;  commitid: 162954304acff7ea6;     xorp/fea/xrl_target.cc