[Xorp-cvs] SF.net SVN: xorp:[11555] trunk/xorp/libxipc

[bms_fbsd at users.sourceforge.net]

Revision: 11555
          http://xorp.svn.sourceforge.net/xorp/?rev=11555&view=rev
Author:   bms_fbsd
Date:     2009-09-24 20:13:33 +0000 (Thu, 24 Sep 2009)

Log Message:
-----------
Comment out the XRL 'kill', 'inproc', and 'udp' transports
from the build.
They are not used in current XORP deployments, and may be
removed at a later date.

Modified Paths:
--------------
    trunk/xorp/libxipc/SConscript
    trunk/xorp/libxipc/xrl_pf_factory.cc
    trunk/xorp/libxipc/xrl_std_router.cc

Modified: trunk/xorp/libxipc/SConscript
===================================================================
--- trunk/xorp/libxipc/SConscript	2009-09-22 16:42:45 UTC (rev 11554)
+++ trunk/xorp/libxipc/SConscript	2009-09-24 20:13:33 UTC (rev 11555)
@@ -54,7 +54,7 @@
     'finder_msgs.cc',
     'finder_tcp.cc',
     'finder_tcp_messenger.cc',
-    'header.cc',			# only for udp
+    #'header.cc',			# only for udp
     'hmac.cc',
     'hmac_md5.c',
     'permits.cc',
@@ -71,16 +71,16 @@
     'xrl_parser_input.cc',
     'xrl_pf.cc',
     'xrl_pf_factory.cc',
-    'xrl_pf_inproc.cc',
-    'xrl_pf_kill.cc',
+    #'xrl_pf_inproc.cc',		# not used in production build
+    #'xrl_pf_kill.cc',			# not used in production build
     'xrl_pf_stcp.cc',
     'xrl_pf_stcp_ph.cc',
-    'xrl_pf_sudp.cc',
+    #'xrl_pf_sudp.cc',			# not used in production build
     'xrl_pf_unix.cc',
     'xrl_router.cc',
     'xrl_std_router.cc',
     'xrl_tokens.cc',
-    'xuid.cc',				# only for udp
+    #'xuid.cc',				# only for udp
     ]
 
 # deal with shared objects

Modified: trunk/xorp/libxipc/xrl_pf_factory.cc
===================================================================
--- trunk/xorp/libxipc/xrl_pf_factory.cc	2009-09-22 16:42:45 UTC (rev 11554)
+++ trunk/xorp/libxipc/xrl_pf_factory.cc	2009-09-24 20:13:33 UTC (rev 11555)
@@ -30,10 +30,10 @@
 #include <map>
 
 #include "xrl_pf_factory.hh"
-#include "xrl_pf_inproc.hh"
-#include "xrl_pf_sudp.hh"
+//#include "xrl_pf_inproc.hh"
+//#include "xrl_pf_sudp.hh"
 #include "xrl_pf_stcp.hh"
-#include "xrl_pf_kill.hh"
+//#include "xrl_pf_kill.hh"
 #include "xrl_pf_unix.hh"
 
 
@@ -49,15 +49,22 @@
     debug_msg("instantiating sender pf = \"%s\", addr = \"%s\"\n",
 	      protocol, address);
     try {
+#if 0
 	if (strcmp(XrlPFSUDPSender::protocol_name(), protocol) == 0) {
 	    return new XrlPFSUDPSender(eventloop, address);
-	} else if (strcmp(XrlPFSTCPSender::protocol_name(), protocol) == 0) {
+	} else
+#endif
+	if (strcmp(XrlPFSTCPSender::protocol_name(), protocol) == 0) {
 	    return new XrlPFSTCPSender(eventloop, address);
-	} else if (strcmp(XrlPFInProcSender::protocol_name(), protocol) == 0) {
+	}
+#if 0
+	else if (strcmp(XrlPFInProcSender::protocol_name(), protocol) == 0) {
 	    return new XrlPFInProcSender(eventloop, address);
 	} else if (strcmp(XrlPFKillSender::protocol_name(), protocol) == 0) {
 	    return new XrlPFKillSender(eventloop, address);
-	} else if (strcmp(XrlPFUNIXSender::protocol_name(), protocol) == 0)
+	} else
+#endif
+	if (strcmp(XrlPFUNIXSender::protocol_name(), protocol) == 0)
 	    return new XrlPFUNIXSender(eventloop, address);
     } catch (XorpException& e) {
 	XLOG_ERROR("XrlPFSenderFactory::create failed: %s\n", e.str().c_str());

Modified: trunk/xorp/libxipc/xrl_std_router.cc
===================================================================
--- trunk/xorp/libxipc/xrl_std_router.cc	2009-09-22 16:42:45 UTC (rev 11554)
+++ trunk/xorp/libxipc/xrl_std_router.cc	2009-09-24 20:13:33 UTC (rev 11555)
@@ -23,9 +23,9 @@
 
 #include "xrl_module.h"
 #include "xrl_std_router.hh"
-#include "xrl_pf_inproc.hh"
+//#include "xrl_pf_inproc.hh"
 #include "xrl_pf_stcp.hh"
-#include "xrl_pf_sudp.hh"
+//#include "xrl_pf_sudp.hh"
 #include "xrl_pf_unix.hh"
 #include "libxorp/xlog.h"
 
@@ -39,11 +39,13 @@
 
     if (pf != NULL) {
 	switch (pf[0]) {
+#if 0
 	case 'i':
 	    return new XrlPFInProcListener(_e, this);
 
 	case 'u':
 	    return new XrlPFSUDPListener(_e, this);
+#endif
 
 	case 'x':
 	    XLOG_ASSERT(_unix == NULL);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.