Feature OpenNebula#2245: New scons option, old_xmlrpc=yes

(cherry picked from commit e98dad2)

Author: carlosms

SConstruct

@@ -118,6 +118,14 @@ if mysql=='yes':
 else:
     main_env.Append(mysql='no')
 
+# Flag to compile with xmlrpc-c versions prior to 1.31 (September 2012)
+old_xmlrpc=ARGUMENTS.get('old_xmlrpc', 'no')
+if old_xmlrpc=='yes':
+    main_env.Append(old_xmlrpc='yes')
+    main_env.Append(CPPFLAGS=["-DOLD_XMLRPC"])
+else:
+    main_env.Append(old_xmlrpc='no')
+
 # SysLog
 syslog=ARGUMENTS.get('syslog', 'no')
 if syslog=='yes':

src/nebula/Nebula.cc

@@ -353,6 +353,17 @@ void Nebula::start()
         os << "Log level:" << clevel << " [0=ERROR,1=WARNING,2=INFO,3=DEBUG]";
 
         NebulaLog::log("ONE",Log::INFO,os);
+
+        os.str("");
+        os << "Support for xmlrpc-c > 1.31: ";
+
+#ifdef OLD_XMLRPC
+        os << "no. MAX_CONN and MAX_CONN_BACKLOG configuration will not be used";
+#else
+        os << "yes";
+#endif
+
+        NebulaLog::log("ONE",Log::INFO,os);
     }
     catch(runtime_error&)
     {

src/rm/RequestManager.cc

@@ -94,6 +94,15 @@ extern "C" void * rm_xml_server_loop(void *arg)
 
     //Start the server
 
+#ifdef OLD_XMLRPC
+    rm->AbyssServer = new xmlrpc_c::serverAbyss(xmlrpc_c::serverAbyss::constrOpt()
+        .registryP(&rm->RequestManagerRegistry)
+        .logFileName(rm->xml_log_file)
+        .keepaliveTimeout(rm->keepalive_timeout)
+        .keepaliveMaxConn(rm->keepalive_max_conn)
+        .timeout(rm->timeout)
+        .socketFd(rm->socket_fd));
+#else
     rm->AbyssServer = new xmlrpc_c::serverAbyss(xmlrpc_c::serverAbyss::constrOpt()
         .registryP(&rm->RequestManagerRegistry)
         .logFileName(rm->xml_log_file)
@@ -103,6 +112,7 @@ extern "C" void * rm_xml_server_loop(void *arg)
         .keepaliveMaxConn(rm->keepalive_max_conn)
         .timeout(rm->timeout)
         .socketFd(rm->socket_fd));
+#endif /* OLD_XMLRPC */
 
     rm->AbyssServer->run();