trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From geor...@apache.org
Subject svn commit: r908143 [3/3] - in /incubator/trafficserver/traffic/branches/dev: ./ ci/ iocore/aio/ iocore/dns/ libinktomi++/ proxy/ proxy/config/ proxy/http2/ proxy/mgmt2/ proxy/mgmt2/api2/remote/ proxy/mgmt2/cop/
Date Tue, 09 Feb 2010 18:20:06 GMT
Modified: incubator/trafficserver/traffic/branches/dev/proxy/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/Makefile.am?rev=908143&r1=908142&r2=908143&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/Makefile.am Tue Feb  9 18:19:44 2010
@@ -169,7 +169,7 @@
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
   $(top_builddir)/libinktomi++/libinktomi++.a \
   @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \
-  @LIBREGEX@ @LIBPCRE@ @LIBDB@ @LIBSSL@ @LIBTCL@ @LIBDL@ \
+  @LIBREGEX@ @LIBPCRE@ @LIBDB@ @LIBSQLITE3@ @LIBSSL@ @LIBTCL@ @LIBDL@ \
   @LIBEXPAT@ @LIBDEMANGLE@ @LIBICONV@ \
   @LIBMLD@ @LIBEXC@ -lm @LIBEV@
 
@@ -233,7 +233,7 @@
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
   $(top_builddir)/libinktomi++/libinktomi++.a \
   @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \
-  @LIBREGEX@ @LIBPCRE@ @LIBDB@ @LIBSSL@ @LIBTCL@ @LIBDL@ @LIBEV@ \
+  @LIBREGEX@ @LIBPCRE@ @LIBDB@ @LIBSQLITE3@ @LIBSSL@ @LIBTCL@ @LIBDL@ @LIBEV@ \
   @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ @LIBICONV@ -lm
 
 logstats_SOURCES = logstats.cc
@@ -293,7 +293,7 @@
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
   $(top_builddir)/libinktomi++/libinktomi++.a \
   @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \
-  @LIBREGEX@ @LIBPCRE@ @LIBDB@ @LIBSSL@ @LIBTCL@ @LIBDL@ @LIBEV@ \
+  @LIBREGEX@ @LIBPCRE@ @LIBDB@ @LIBSQLITE3@ @LIBSSL@ @LIBTCL@ @LIBDL@ @LIBEV@ \
   @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ @LIBICONV@ -lm
 
 sac_CPPFLAGS = \
@@ -356,7 +356,7 @@
   $(top_builddir)/librecords/librecprocess.a \
   $(top_builddir)/libinktomi++/libinktomi++.a \
   @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \
-  @LIBREGEX@ @LIBPCRE@ @LIBDB@ @LIBSSL@ @LIBTCL@ @LIBDL@ @LIBEV@ \
+  @LIBREGEX@ @LIBPCRE@ @LIBDB@ @LIBSQLITE3@ @LIBSSL@ @LIBTCL@ @LIBDL@ @LIBEV@ \
   @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ @LIBICONV@ -lm
 
 cust_log_fmt_cnvrt_SOURCES = cust_log_fmt_cnvrt.cc

Modified: incubator/trafficserver/traffic/branches/dev/proxy/config/records.config.in
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/config/records.config.in?rev=908143&r1=908142&r2=908143&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/config/records.config.in (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/config/records.config.in Tue Feb  9
18:19:44 2010
@@ -39,9 +39,9 @@
 CONFIG proxy.config.system.mmap_max INT 2097152
 CONFIG proxy.config.system.memalign_heap INT 0
 CONFIG proxy.config.exec_thread.autoconfig INT 1
-CONFIG proxy.config.exec_thread.autoconfig.scale FLOAT 2.5
+CONFIG proxy.config.exec_thread.autoconfig.scale FLOAT 3.0
 CONFIG proxy.config.exec_thread.limit INT 2
-CONFIG proxy.config.accept_threads INT 0
+CONFIG proxy.config.accept_threads INT 1
 ##############################################################################
 #
 # Local Manager
@@ -92,49 +92,6 @@
 CONFIG proxy.config.alarm.abs_path STRING NULL
 ##############################################################################
 #
-# Authentication Basic Realm
-##############################################################################
-CONFIG proxy.config.proxy.authenticate.basic.realm STRING NULL
-##############################################################################
-#
-# LDAP
-#
-##############################################################################
-CONFIG proxy.config.ldap.auth.enabled INT 0
-CONFIG proxy.config.ldap.auth.ttl_value INT 3000
-CONFIG proxy.config.ldap.auth.purge_cache_on_auth_fail INT 0
-CONFIG proxy.config.ldap.proc.ldap.server.name STRING NULL
-CONFIG proxy.config.ldap.proc.ldap.server.port INT 389
-CONFIG proxy.config.ldap.proc.ldap.base.dn STRING NULL
-CONFIG proxy.config.ldap.proc.ldap.uid_filter STRING uid
-##############################################################################
-#
-# RADIUS Authentication
-#
-##############################################################################
-CONFIG proxy.config.radius.auth.enabled INT 0
-CONFIG proxy.config.radius.proc.radius.primary_server.name STRING NULL
-CONFIG proxy.config.radius.proc.radius.primary_server.auth_port INT 1812
-CONFIG proxy.config.radius.proc.radius.primary_server.shared_key STRING NULL
-CONFIG proxy.config.radius.proc.radius.secondary_server.name STRING NULL
-CONFIG proxy.config.radius.proc.radius.secondary_server.auth_port INT 1812
-CONFIG proxy.config.radius.proc.radius.secondary_server.shared_key STRING NULL
-CONFIG proxy.config.radius.auth.min_timeout INT 10
-CONFIG proxy.config.radius.auth.max_retries INT 10
-CONFIG proxy.config.radius.auth.ttl_value INT 60
-##############################################################################
-#
-# NTLM
-#
-##############################################################################
-CONFIG proxy.config.ntlm.auth.enabled INT 0
-CONFIG proxy.config.ntlm.dc.list STRING NULL
-CONFIG proxy.config.ntlm.dc.load_balance INT 0
-CONFIG proxy.config.ntlm.dc.max_connections INT 3
-CONFIG proxy.config.ntlm.nt_domain STRING NULL
-CONFIG proxy.config.ntlm.cache.ttl_value INT 3600
-##############################################################################
-#
 # HTTP Engine
 #
 ##############################################################################
@@ -268,7 +225,6 @@
    # cache control #
    #################
 CONFIG proxy.config.http.cache.http INT 1
-CONFIG proxy.config.http.cache.ftp INT 0
 CONFIG proxy.config.http.cache.ignore_client_no_cache INT 1
 CONFIG proxy.config.http.cache.ims_on_client_no_cache INT 1
 CONFIG proxy.config.http.cache.ignore_server_no_cache INT 0
@@ -318,18 +274,6 @@
 CONFIG proxy.config.http.cache.vary_default_text STRING NULL
 CONFIG proxy.config.http.cache.vary_default_images STRING NULL
 CONFIG proxy.config.http.cache.vary_default_other STRING NULL
-   ##########################
-   # anonymous ftp password #
-   ##########################
-CONFIG proxy.config.http.ftp.anonymous_passwd STRING anonymous@
-   ################################
-   # cached ftp document lifetime #
-   ################################
-CONFIG proxy.config.http.ftp.cache.document_lifetime INT 259200
-   #####################
-   # ftp transfer mode #
-   #####################
-CONFIG proxy.config.http.ftp.binary_transfer_only INT 0
 ##############################################################################
 #
 # Customizable User Response Pages
@@ -347,72 +291,6 @@
 CONFIG proxy.config.body_factory.response_suppression_mode INT 0
 ##############################################################################
 #
-# Ftp Engine
-#
-##############################################################################
-##############################################################################
-# Ftp over Http
-##############################################################################
-   # ftp_mode:
-   #   1 PASV then PORT
-   #   2 PORT only
-   #   3 PASV only
-CONFIG proxy.config.ftp.data_connection_mode INT 1
-CONFIG proxy.config.ftp.control_connection_timeout INT 300
-CONFIG proxy.config.ftp.rc_to_switch_to_PORT STRING NULL
-##############################################################################
-# Ftp Proxy
-##############################################################################
-CONFIG proxy.config.ftp.ftp_enabled INT 0
-CONFIG proxy.config.ftp.cache_enabled INT 0
-CONFIG proxy.config.ftp.logging_enabled INT 0
-CONFIG proxy.config.ftp.proxy_server_port INT 21
-   # the mode to open a listening port
-   #   1 let the OS pick an available listening port
-   #   2 use the range specified by min_lisn_port and max_lisn_port
-CONFIG proxy.config.ftp.open_lisn_port_mode INT 1
-CONFIG proxy.config.ftp.min_lisn_port INT 32768
-CONFIG proxy.config.ftp.max_lisn_port INT 65535
-CONFIG proxy.config.ftp.server_data_default_pasv INT 1
-CONFIG proxy.config.ftp.different_client_port_ip_allowed INT 0
-CONFIG proxy.config.ftp.try_pasv_times INT 1024
-CONFIG proxy.config.ftp.try_port_times INT 1024
-CONFIG proxy.config.ftp.try_server_ctrl_connect_times INT 6
-CONFIG proxy.config.ftp.try_server_data_connect_times INT 3
-CONFIG proxy.config.ftp.try_client_data_connect_times INT 3
-CONFIG proxy.config.ftp.client_ctrl_no_activity_timeout INT 900
-CONFIG proxy.config.ftp.client_ctrl_active_timeout INT 14400
-CONFIG proxy.config.ftp.server_ctrl_no_activity_timeout INT 120
-CONFIG proxy.config.ftp.server_ctrl_active_timeout INT 14400
-CONFIG proxy.config.ftp.client_data_no_activity_timeout INT 120
-CONFIG proxy.config.ftp.client_data_active_timeout INT 14400
-CONFIG proxy.config.ftp.server_data_no_activity_timeout INT 120
-CONFIG proxy.config.ftp.server_data_active_timeout INT 14400
-CONFIG proxy.config.ftp.pasv_accept_timeout INT 120
-CONFIG proxy.config.ftp.port_accept_timeout INT 120
-CONFIG proxy.config.ftp.share_ftp_server_ctrl_enabled INT 1
-CONFIG proxy.config.ftp.share_only_after_session_end INT 1
-CONFIG proxy.config.ftp.server_ctrl_keep_alive_no_activity_timeout INT 90
-CONFIG proxy.config.ftp.reverse_ftp_enabled INT 0
-CONFIG proxy.config.ftp.login_info_fresh_in_cache_time INT 604800
-CONFIG proxy.config.ftp.directory_listing_fresh_in_cache_time INT 86400
-CONFIG proxy.config.ftp.file_fresh_in_cache_time INT 259200
-CONFIG proxy.config.ftp.simple_directory_listing_cache_enabled INT 1
-CONFIG proxy.config.ftp.full_directory_listing_cache_enabled INT 1
-CONFIG proxy.config.ftp.file_fresh_mdtm_checking_enabled INT 0
-CONFIG proxy.config.ftp.data_source_port_20_enabled INT 0
-##############################################################################
-#
-# SOCKS Processor
-#
-##############################################################################
-CONFIG proxy.config.socks.socks_needed INT 0
-CONFIG proxy.config.socks.socks_version INT 4
-CONFIG proxy.config.socks.default_servers STRING s1.example.com:1080;socks2:4080
-CONFIG proxy.config.socks.accept_enabled INT 0
-CONFIG proxy.config.socks.accept_port INT 1080
-##############################################################################
-#
 # Net Subsystem
 #
 ##############################################################################
@@ -539,71 +417,6 @@
 CONFIG proxy.config.log2.sampling_frequency INT 1
 ##############################################################################
 #
-# Tunable for MIXT in general
-#
-##############################################################################
-CONFIG proxy.config.cache.ram_cache_mixt_cutoff INT 1048576
-CONFIG proxy.config.resource.target_maxmem_mb INT 0
-##############################################################################
-#
-# Windows Media Technology Configuration
-#
-##############################################################################
-CONFIG proxy.config.wmt.enabled INT 0
-CONFIG proxy.config.wmt.port INT 1755
-CONFIG proxy.config.wmt.asx_rewrite.enabled INT 1
-CONFIG proxy.config.wmt.media_bridge.name STRING NULL
-CONFIG proxy.config.wmt.media_bridge.port INT 10022
-CONFIG proxy.config.wmt.media_bridge.mount_point STRING ffnet
-CONFIG proxy.config.wmt.media_bridge.monitor.version INT 0
-CONFIG proxy.config.wmt.media_bridge.monitor.port INT 10088
-CONFIG proxy.config.wmt.media_bridge.monitor.name STRING NULL
-CONFIG proxy.config.wmt.max_rexmit_memory INT 20971520
-CONFIG proxy.config.wmt.inactivity_timeout INT 21600
-##############################################################################
-#
-# MIXT WMTMCast Configuration
-#
-##############################################################################
-CONFIG proxy.config.mixt.wmtmcast.enabled INT 1
-##############################################################################
-#
-# MIXT Push Configuration
-#
-##############################################################################
-CONFIG proxy.config.mixt.push.enabled INT 1
-CONFIG proxy.config.mixt.push.port INT 1900
-CONFIG proxy.config.mixt.push.password STRING NULL
-##############################################################################
-#
-# QuickTime Config
-#
-##############################################################################
-CONFIG proxy.config.qt.enabled INT 0
-CONFIG proxy.config.mixt.rtsp_proxy_port INT 554
-CONFIG proxy.config.qt.media_bridge.name STRING NULL
-CONFIG proxy.config.qt.media_bridge.port INT 10036
-CONFIG proxy.config.qt.media_bridge.mount_point STRING ffnet
-CONFIG proxy.config.qt.media_bridge.monitor.name STRING NULL
-CONFIG proxy.config.qt.media_bridge.monitor.port INT 10088
-##############################################################################
-#
-# RNI Config
-#
-##############################################################################
-CONFIG proxy.config.rni.enabled INT 0
-CONFIG proxy.config.rni.watcher_enabled INT 0
-CONFIG proxy.config.rni.proxy_port INT 9231
-CONFIG proxy.config.rni.proxy_pid_path STRING NULL
-CONFIG proxy.config.rni.proxy_restart_cmd STRING NULL
-CONFIG proxy.config.rni.proxy_restart_interval INT 20
-CONFIG proxy.config.rni.proxy_service_name STRING RMProxy
-CONFIG proxy.config.rni.auth_port INT 7808
-   # Real Passthrough
-CONFIG proxy.config.rni.rpass_watcher_enabled INT 0
-CONFIG proxy.config.rni.rpass_restart_cmd STRING NULL
-##############################################################################
-#
 # Reverse Proxy
 #
 ##############################################################################
@@ -718,14 +531,6 @@
 CONFIG proxy.config.update.concurrent_updates INT 100
 ##############################################################################
 #
-# SNMP Configuration
-#
-##############################################################################
-   # Start MIB-II Host MIB (TCP/UDP stats, etc.) and traffic server MIB
-CONFIG proxy.config.snmp.master_agent_enabled INT 0
-CONFIG proxy.config.snmp.snmp_encap_enabled INT 0
-##############################################################################
-#
 # Plug-in Configuration
 #
 ##############################################################################

Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransact.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransact.cc?rev=908143&r1=908142&r2=908143&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransact.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransact.cc Tue Feb  9 18:19:44
2010
@@ -8597,6 +8597,8 @@
   inku32
     cc_mask,
     cooked_cc_mask;
+  inku32
+    os_specifies_revalidate;
 
 
   //////////////////////////////////////////////////////
@@ -8621,9 +8623,9 @@
 
 
   cooked_cc_mask = cached_obj_response->get_cooked_cc_mask();
-  cc_mask =
-    (MIME_COOKED_MASK_CC_MUST_REVALIDATE |
-     MIME_COOKED_MASK_CC_PROXY_REVALIDATE | MIME_COOKED_MASK_CC_NEED_REVALIDATE_ONCE);
+  os_specifies_revalidate = cooked_cc_mask &
+    (MIME_COOKED_MASK_CC_MUST_REVALIDATE | MIME_COOKED_MASK_CC_PROXY_REVALIDATE);
+  cc_mask = MIME_COOKED_MASK_CC_NEED_REVALIDATE_ONCE;
 
   // Check to see if the server forces revalidation
 
@@ -8716,13 +8718,18 @@
     // if max-stale set, relax the freshness limit //
     /////////////////////////////////////////////////
     if (cooked_cc_mask & MIME_COOKED_MASK_CC_MAX_STALE) {
-      int
-        max_stale_val = client_request->get_cooked_cc_max_stale();
-      if (max_stale_val != MAXINT)
-        age_limit += max_stale_val;
-      else
-        age_limit = max_stale_val;
-      Debug("http_match", "[..._document_freshness] max-stale set, age limit: %d", age_limit);
+      if (os_specifies_revalidate) {
+        Debug("http_match", "[...document_freshness] OS specifies revalidation; "
+              "ignoring client's max-stale request...");
+      } else {
+        int max_stale_val = client_request->get_cooked_cc_max_stale();
+
+        if (max_stale_val != MAXINT)
+          age_limit += max_stale_val;
+        else
+          age_limit = max_stale_val;
+        Debug("http_match", "[..._document_freshness] max-stale set, age limit: %d", age_limit);
+      }
     }
     /////////////////////////////////////////////////////
     // if min-fresh set, constrain the freshness limit //
@@ -8735,8 +8742,7 @@
     // if max-age set, constrain the freshness limit //
     ///////////////////////////////////////////////////
     if (!s->cache_control.ignore_client_cc_max_age && (cooked_cc_mask & MIME_COOKED_MASK_CC_MAX_AGE))
{
-      int
-        age_val = client_request->get_cooked_cc_max_age();
+      int age_val = client_request->get_cooked_cc_max_age();
       if (age_val == 0)
         do_revalidate = true;
       age_limit = min(age_limit, age_val);
@@ -8770,12 +8776,23 @@
   // now, see if the age is "fresh enough" //
   ///////////////////////////////////////////
 
-  if (do_revalidate || current_age > age_limit) // client-modified limit
+  if (do_revalidate || current_age > age_limit) { // client-modified limit
+    DebugOn("http_match", "[..._document_freshness] document needs revalidate/too old; "
+            "returning FRESHNESS_STALE");
     return (FRESHNESS_STALE);
-  else if (current_age > fresh_limit)   // original limit
+  } else if (current_age > fresh_limit) {  // original limit
+    if (os_specifies_revalidate) {
+      DebugOn("http_match", "[..._document_freshness] document is stale and OS specifies
revalidation; "
+              "returning FRESHNESS_STALE");
+      return (FRESHNESS_STALE);
+    }
+    DebugOn("http_match", "[..._document_freshness] document is stale but no revalidation
explicitly required; "
+            "returning FRESHNESS_WARNING");
     return (FRESHNESS_WARNING);
-  else
+  } else {
+    DebugOn("http_match", "[..._document_freshness] document is fresh; returning FRESHNESS_FRESH");
     return (FRESHNESS_FRESH);
+  }
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -8811,7 +8828,8 @@
   ///////////////////////////////////////////////////////////////////////
 
   if (client_request->presence(MIME_PRESENCE_AUTHORIZATION) && p->cache_ignore_auth
== 0) {
-    if (obj_response->is_cache_control_set(HTTP_VALUE_MUST_REVALIDATE)) {
+    if (obj_response->is_cache_control_set(HTTP_VALUE_MUST_REVALIDATE) ||
+        obj_response->is_cache_control_set(HTTP_VALUE_PROXY_REVALIDATE)) {
       return AUTHENTICATION_MUST_REVALIDATE;
     } else if (obj_response->is_cache_control_set(HTTP_VALUE_PROXY_REVALIDATE)) {
       return AUTHENTICATION_MUST_REVALIDATE;

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Makefile.am?rev=908143&r1=908142&r2=908143&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Makefile.am Tue Feb  9 18:19:44
2010
@@ -121,6 +121,6 @@
   $(top_builddir)/proxy/mgmt2/tools/libinksysapi.a \
   $(top_builddir)/proxy/mgmt2/tools/libinkconfigapi.a \
   @LIBEXPAT@ \
-  @LIBSSL@ @LIBDB@ @LIBREGEX@ @LIBTCL@ @LIBICONV@ \
+  @LIBSSL@ @LIBDB@ @LIBSQLITE3@ @LIBREGEX@ @LIBTCL@ @LIBICONV@ \
   @LIBM@ @LIBDL@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ \
   @LIBTHREAD@ @LIBRT@

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/Makefile.am?rev=908143&r1=908142&r2=908143&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/Makefile.am Tue Feb
 9 18:19:44 2010
@@ -60,4 +60,4 @@
   libmgmtapiremote.a \
   $(top_builddir)/libinktomi++/libinktomi++.a \
   @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ \
-  @LIBTCL@ @LIBDB@ @LIBRT@ @LIBDL@ @LIBSSL@ @LIBICONV@
+  @LIBTCL@ @LIBDB@ @LIBSQLITE3@ @LIBRT@ @LIBDL@ @LIBSSL@ @LIBICONV@

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cop/TrafficCop.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cop/TrafficCop.cc?rev=908143&r1=908142&r2=908143&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cop/TrafficCop.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cop/TrafficCop.cc Tue Feb  9
18:19:44 2010
@@ -79,7 +79,7 @@
 static int syslog_facility = LOG_DAEMON;
 static char syslog_fac_str[PATH_MAX];
 
-static int rni_killsig = SIGTERM;
+//static int rni_killsig = SIGTERM;
 static int killsig = SIGKILL;
 static int coresig = 0;
 
@@ -101,6 +101,7 @@
 static int server_failures = 0;
 static int server_not_found = 0;
 
+#if 0 // TODO: REMOVE RNI
 // connect to proxy port and hand it the RTSP port
 static time_t rni_last_restart = 0;
 static int rni_proxy_start_succeed = 1;
@@ -116,6 +117,7 @@
 static char rni_rpass_lockfile[PATH_MAX];
 static char rni_rpass_restart_cmd[PATH_MAX] = "";
 static char rni_rpass_binary[PATH_MAX] = "";
+#endif
 
 static const int sleep_time = 10;       // 10 sec
 static const int manager_timeout = 3 * 60;      //  3 min
@@ -138,10 +140,12 @@
 
 static const int kill_timeout = 1 * 60; //  1 min
 
+#if 0 // TODO: REMOVE RNI
 #define DEFAULT_RNI_RESTART_INTERVAL 20 // 20 seconds
 static int rni_restart_interval = DEFAULT_RNI_RESTART_INTERVAL;
 #define DEFAULT_RNI_RPASS_SWITCH_INTERVAL 60
 static int rni_rpass_switch_interval = DEFAULT_RNI_RPASS_SWITCH_INTERVAL;
+#endif
 
 static int child_pid = 0;
 static int child_status = 0;
@@ -613,6 +617,7 @@
   exit(1);
 }
 
+#if 0 // Used by RNI
 // extract the binary name from a cmd
 static void
 get_binary_from_cmd(char *cmdline, char *binary)
@@ -639,6 +644,7 @@
   cop_log(COP_DEBUG, "Leaving get_binary_from_cmd(%s, <%s>)\n", cmdline, binary);
 #endif
 }
+#endif
 
 static void
 read_config()
@@ -723,6 +729,7 @@
   read_config_int("proxy.config.cop.linux_min_swapfree_kb", &check_memory_min_swapfree_kb);
   read_config_int("proxy.config.cop.linux_min_memfree_kb", &check_memory_min_memfree_kb);
 
+#if 0 // TODO: REMOVE RNI
   // Real Networks stuff
   read_config_int("proxy.config.rni.watcher_enabled", &rni_watcher_enabled);
   if (rni_watcher_enabled) {
@@ -749,11 +756,13 @@
       get_binary_from_cmd(rni_rpass_restart_cmd, rni_rpass_binary);
     }
   }
+#endif
 #ifdef TRACE_LOG_COP
   cop_log(COP_DEBUG, "Leaving read_config()\n");
 #endif
 }
 
+#if 0 // Used by RNI
 //
 // Get process ID in file
 //
@@ -831,6 +840,7 @@
 #endif
   return 0;
 }
+#endif
 
 static void
 spawn_manager()
@@ -932,6 +942,7 @@
 #endif
 }
 
+#if 0 // TODO: REMOVE RNI
 //
 // Spawn G2 Real Server
 //
@@ -1143,7 +1154,7 @@
   }
 }
 
-
+#endif // TODO: REMOVE RNI
 
 
 static int
@@ -1731,7 +1742,7 @@
   }
 }
 
-
+#if 0 // TODO: REMOVE RNI
 //
 // Check health status for G2 Real Server
 //
@@ -1786,6 +1797,7 @@
   }
 #endif
 }
+#endif // TODO: REMOVE RNI
 
 //         |  state  |  status  |  action
 // --------|---------|----------|---------------
@@ -1807,11 +1819,12 @@
 {
   int err;
   pid_t holding_pid;
-  pid_t rni_pid;
 
 #ifdef TRACE_LOG_COP
   cop_log(COP_DEBUG, "Entering check_programs()\n");
 #endif
+#if 0 // TODO: REMOVE RNI
+  pid_t rni_pid;
   if (rni_last_restart > 0) {
     rni_pid = getholding_pid(rni_proxy_pid_path);
     if (rni_pid == 0 || kill(rni_pid, 0) == -1) {
@@ -1842,6 +1855,8 @@
   if (rni_rpass_watcher_enabled && !rni_proxy_start_succeed) {
     check_rpass();
   }
+#endif // TODO: REMOVE RNI
+
   // Try to get the manager lock file. If we succeed in doing this,
   // it means there is no manager running.
   Lockfile manager_lf(manager_lockfile);
@@ -2280,8 +2295,9 @@
   snprintf(cop_lockfile, sizeof(cop_lockfile), "%s%s%s", local_state_dir, DIR_SEP, COP_LOCK);
   snprintf(manager_lockfile, sizeof(manager_lockfile), "%s%s%s", local_state_dir, DIR_SEP,
MANAGER_LOCK);
   snprintf(server_lockfile, sizeof(server_lockfile), "%s%s%s", local_state_dir, DIR_SEP,
SERVER_LOCK);
+#if 0 // TODO: REMOVE RNI
   snprintf(rni_rpass_lockfile, sizeof(rni_rpass_lockfile), "%s%s%s", local_state_dir, DIR_SEP,
RNI_RPASS_LOCK);
-
+#endif
 
 #ifdef TRACE_LOG_COP
   cop_log(COP_DEBUG, "Leaving init_lockfiles()\n");



Mime
View raw message