trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject svn commit: r938979 [2/5] - in /incubator/trafficserver/traffic/trunk: doc/man/ iocore/cache/ iocore/cluster/ iocore/eventsystem/ libinktomi++/ librecords/ proxy/ proxy/api/include/ proxy/config/ proxy/congest/ proxy/http2/ proxy/logging/ proxy/mgmt2/ ...
Date Wed, 28 Apr 2010 13:54:20 GMT
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/StatAggregation.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/StatAggregation.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/StatAggregation.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/StatAggregation.cc Wed Apr 28 13:54:17 2010
@@ -144,7 +144,7 @@ Ag_cachePercent()
 }
 
 
-// HTTP/FTP/NNTP hit stats
+// HTTP/FTP hit stats
 // NOTE: no cache hit info. for WMT, QT
 static const char *hitCounters[] = {
   "proxy.process.http.cache_hit_fresh", // 0
@@ -153,12 +153,11 @@ static const char *hitCounters[] = {
   "proxy.process.http.cache_hit_stale_served",  // 3
   "proxy.process.ftp.cache_hits",       // 4 FTP over HTTP
   "proxy.process.ftp.cache_hit_fresh",  // 5
-  "proxy.process.nntp.cache_hit_fresh", // 6
-  "proxy.process.rni.block_hit_count",  // 7
+  "proxy.process.rni.block_hit_count",  // 6
   NULL
 };
 
-// HTTP/FTP/NNTP miss stats
+// HTTP/FTP miss stats
 // NOTE: no cache miss info. for WMT, QT
 static const char *missCounters[] = {
   "proxy.process.http.cache_miss_cold", // 0
@@ -169,14 +168,13 @@ static const char *missCounters[] = {
   "proxy.process.http.cache_read_error",        // 5
   "proxy.process.ftp.cache_misses",     // 6 FTP over HTTP
   "proxy.process.ftp.cache_miss_cold",  // 7
-  "proxy.process.nntp.cache_miss_cold", // 8
-  "proxy.process.rni.block_miss_count", // 9
+  "proxy.process.rni.block_miss_count", // 8
   NULL
 };
 
 //
 // Calculate Node cache hits/misses i.e. hit ratio
-// Should include HTTP/FTP/NNTP and maybe RNI(?)
+// Should include HTTP/FTP and maybe RNI(?)
 //
 void
 Ag_cacheHits()
@@ -199,7 +197,6 @@ Ag_cacheHits()
     {"proxy.process.http.cache_hit_stale_served", 0, 0, 0, 0},  // 3
     {"proxy.process.ftp.cache_hits", 0, 0, 0, 0},       // 4 FTP over HTTP
     {"proxy.process.ftp.cache_hit_fresh", 0, 0, 0, 0},  // 5
-    {"proxy.process.nntp.cache_hit_fresh", 0, 0, 0, 0}, // 6
     {"proxy.process.rni.block_hit_count", 0, 0, 0, 0},  // 7
     {NULL, -1, -1, -1, -1}
   };
@@ -214,7 +211,6 @@ Ag_cacheHits()
     {"proxy.process.http.cache_read_error", 0, 0, 0, 0},        // 5 
     {"proxy.process.ftp.cache_misses", 0, 0, 0, 0},     // 6 FTP over HTTP
     {"proxy.process.ftp.cache_miss_cold", 0, 0, 0, 0},  // 7
-    {"proxy.process.nntp.cache_miss_cold", 0, 0, 0, 0}, // 8
     {"proxy.process.rni.block_miss_count", 0, 0, 0, 0}, // 9
     {NULL, -1, -1, -1, -1}
   };
@@ -227,7 +223,6 @@ Ag_cacheHits()
     "proxy.node.http.cache_hit_stale_served_avg_10s",   // 3
     "proxy.node.ftp.cache_hits_avg_10s",        // 4 FTP over HTTP
     "proxy.node.ftp.cache_hit_fresh_avg_10s",   // 6
-    "proxy.node.nntp.cache_hit_fresh_avg_10s",  // 7
     "proxy.node.rni.block_hit_count_avg_10s",   // 8
     NULL
   };
@@ -242,7 +237,6 @@ Ag_cacheHits()
     "proxy.node.http.cache_read_error_avg_10s", // 5
     "proxy.node.ftp.cache_misses_avg_10s",      // 6 FTP over HTTP
     "proxy.node.ftp.cache_miss_cold_avg_10s",   // 7
-    "proxy.node.nntp.cache_miss_cold_avg_10s",  // 8
     "proxy.node.rni.block_miss_count_avg_10s",  // 9
     NULL
   };
@@ -695,11 +689,9 @@ Ag_Throughput()
   const ink_hrtime window = 10 * HRTIME_SECOND; // update every 10 seconds
   static StatTwoIntSamples node_http_user_agent_total_response_bytes =
     { "proxy.node.http.user_agent_total_response_bytes", 0, 0, 0, 0 };
-  static StatTwoIntSamples node_nntp_downstream_total_bytes = { "proxy.node.nntp.downstream_total_bytes", 0, 0, 0, 0 };
   static StatTwoIntSamples node_ftp_downstream_total_bytes = { "proxy.node.ftp.downstream_total_bytes", 0, 0, 0, 0 };
   static StatTwoIntSamples node_rni_downstream_total_bytes = { "proxy.node.rni.downstream_total_bytes", 0, 0, 0, 0 };
   static const char *node_http_ua_total_response_bytes_name = "proxy.node.http.user_agent_total_response_bytesavg_10s";
-  static const char *node_nntp_downstream_total_bytes_name = "proxy.node.nntp.downstream_total_bytes_avg_10s";
   static const char *node_ftp_downstream_total_bytes_name = "proxy.node.ftp.downstream_total_bytes_avg_10s";
   static const char *node_rni_downstream_total_bytes_name = "proxy.node.rni.downstream_total_bytes_avg_10s";
   static ink_hrtime lastThroughputTime = 0;
@@ -707,16 +699,12 @@ Ag_Throughput()
   // These aren't used.
   //static MgmtInt lastBytesHttpUAThrough;
   //static MgmtInt lastBytesHttpOSThrough;
-  //static MgmtInt lastBytesNNTPUAThrough; 
-  //static MgmtInt lastBytesNNTPOSThrough; 
   //static MgmtInt lastBytesFTPUAThrough; 
   //static MgmtInt lastBytesFTPOSThrough; 
   //static MgmtInt lastBytesRNIUAThrough; 
   MgmtInt bytesThrough;
   MgmtInt bytesHttpUAThrough;
   MgmtInt bytesHttpOSThrough;
-  MgmtInt bytesNNTPUAThrough;
-  MgmtInt bytesNNTPOSThrough;
   MgmtInt bytesFTPUAThrough;
   MgmtInt bytesFTPOSThrough;
   MgmtInt bytesRNIUAThrough;
@@ -730,19 +718,15 @@ Ag_Throughput()
 
   // Avoid warnings, we might want to clear out some of these variables ... /leif.
   NOWARN_UNUSED(node_http_user_agent_total_response_bytes);
-  NOWARN_UNUSED(node_nntp_downstream_total_bytes);
   NOWARN_UNUSED(node_ftp_downstream_total_bytes);
   NOWARN_UNUSED(node_rni_downstream_total_bytes);
   NOWARN_UNUSED(node_http_ua_total_response_bytes_name);
-  NOWARN_UNUSED(node_nntp_downstream_total_bytes_name);
   NOWARN_UNUSED(node_ftp_downstream_total_bytes_name);
   NOWARN_UNUSED(node_rni_downstream_total_bytes_name);
 
   if (diffTime > window) {
     if (varIntFromName("proxy.node.http.user_agent_total_response_bytes", &bytesHttpUAThrough)
         && varIntFromName("proxy.node.http.origin_server_total_response_bytes", &bytesHttpOSThrough)
-        && varIntFromName("proxy.node.nntp.upstream_total_bytes", &bytesNNTPOSThrough)
-        && varIntFromName("proxy.node.nntp.downstream_total_bytes", &bytesNNTPUAThrough)
         && varIntFromName("proxy.node.ftp.upstream_total_bytes", &bytesFTPOSThrough)
         && varIntFromName("proxy.node.ftp.downstream_total_bytes", &bytesFTPUAThrough)
         && varIntFromName("proxy.node.rni.downstream_total_bytes", &bytesRNIUAThrough)
@@ -753,10 +737,10 @@ Ag_Throughput()
         && varIntFromName("proxy.node.qt.downstream_total_bytes", &bytesQTUAThrough)
 #endif
       ) {
-      bytesThrough = bytesHttpUAThrough + bytesNNTPUAThrough + bytesFTPUAThrough +
+      bytesThrough = bytesHttpUAThrough + bytesFTPUAThrough +
         bytesRNIUAThrough + bytesWMTUAThrough + bytesQTUAThrough;
       if (lastThroughputTime != 0 && bytesThrough != 0) {
-        if (lastBytesThrough > (bytesHttpUAThrough + bytesNNTPUAThrough + bytesFTPUAThrough +
+        if (lastBytesThrough > (bytesHttpUAThrough + bytesFTPUAThrough +
                                 bytesRNIUAThrough + bytesWMTUAThrough + bytesQTUAThrough)) {
           // The proxy must have died so just set the value to zero
           intSum = 0;
@@ -818,7 +802,6 @@ Ag_XactsPerSecond()
   static ink_hrtime lastXactLookupTime = 0;
   static MgmtInt lastTotalXactLookup = 0;
   static MgmtInt lastHttpXactLookup = 0;
-  static MgmtInt lastNntpXactLookup = 0;
   static MgmtInt lastFtpXactLookup = 0;
   static MgmtInt lastRniXactLookup = 0;
   static MgmtInt lastWmtXactLookup = 0;
@@ -826,7 +809,6 @@ Ag_XactsPerSecond()
   ink_hrtime nowTime = ink_get_hrtime();
   ink_hrtime diffTime = nowTime - lastXactLookupTime;
   MgmtInt totalXacts = 0;
-  MgmtInt nntpXacts = 0;
   MgmtInt ftpXacts = 0;
   MgmtInt httpXacts = 0;
   MgmtInt rniXacts = 0;
@@ -835,7 +817,6 @@ Ag_XactsPerSecond()
   double tmp;
   MgmtFloat totalfloatSum = 0.0;
   MgmtFloat httpSum = 0.0;
-  MgmtFloat nntpSum = 0.0;
   MgmtFloat ftpSum = 0.0;
   MgmtFloat rniSum = 0.0;
   MgmtFloat wmtSum = 0.0;
@@ -843,18 +824,16 @@ Ag_XactsPerSecond()
 
   if (diffTime > hrThreshold) {
     if (varIntFromName("proxy.process.http.incoming_requests", &httpXacts)
-        && varIntFromName("proxy.process.nntp.incoming_requests", &nntpXacts)
         && varIntFromName("proxy.process.ftp.incoming_requests", &ftpXacts)
         && varIntFromName("proxy.process.rni.downstream_requests", &rniXacts)
         && varIntFromName("proxy.process.wmt.downstream_requests", &wmtXacts)
         && varIntFromName("proxy.process.qt.downstream_requests", &qtXacts)) {
-      totalXacts = nntpXacts + ftpXacts + httpXacts + rniXacts + wmtXacts + qtXacts;
+      totalXacts = ftpXacts + httpXacts + rniXacts + wmtXacts + qtXacts;
       if (lastXactLookupTime != 0 && lastTotalXactLookup != 0) {
         if (lastTotalXactLookup > totalXacts) {
           // The proxy must have died so just set the value to zero
           totalfloatSum = 0.0;
           httpSum = 0.0;
-          nntpSum = 0.0;
           ftpSum = 0.0;
           rniSum = 0.0;
           wmtSum = 0.0;
@@ -864,8 +843,6 @@ Ag_XactsPerSecond()
           totalfloatSum = (MgmtFloat) (tmp * HRTIME_SECOND);
           tmp = (MgmtFloat) ((double) (httpXacts - lastHttpXactLookup) / diffTime);
           httpSum = (MgmtFloat) (tmp * HRTIME_SECOND);
-          tmp = (MgmtFloat) ((double) (nntpXacts - lastNntpXactLookup) / diffTime);
-          nntpSum = (MgmtFloat) (tmp * HRTIME_SECOND);
           tmp = (MgmtFloat) ((double) (ftpXacts - lastFtpXactLookup) / diffTime);
           ftpSum = (MgmtFloat) (tmp * HRTIME_SECOND);
           tmp = (MgmtFloat) ((double) (rniXacts - lastRniXactLookup) / diffTime);
@@ -877,7 +854,6 @@ Ag_XactsPerSecond()
         }
         varSetFloat("proxy.node.user_agent_xacts_per_second", totalfloatSum);
         varSetFloat("proxy.node.http.user_agent_xacts_per_second", httpSum);
-        varSetFloat("proxy.node.nntp.user_agent_xacts_per_second", nntpSum);
         varSetFloat("proxy.node.ftp.user_agent_xacts_per_second", ftpSum);
         varSetFloat("proxy.node.rni.user_agent_xacts_per_second", rniSum);
         varSetFloat("proxy.node.wmt.user_agent_xacts_per_second", wmtSum);
@@ -886,7 +862,6 @@ Ag_XactsPerSecond()
       lastXactLookupTime = nowTime;
       lastTotalXactLookup = totalXacts;
       lastHttpXactLookup = httpXacts;
-      lastNntpXactLookup = nntpXacts;
       lastFtpXactLookup = ftpXacts;
       lastRniXactLookup = rniXacts;
       lastWmtXactLookup = wmtXacts;
@@ -896,13 +871,12 @@ Ag_XactsPerSecond()
 }
 
 //
-// Aggregate total documents served for HTTP/FTP/NNTP and RNI(?)
+// Aggregate total documents served for HTTP/FTP and RNI(?)
 //
 void
 Ag_TotalDocumentsServed()
 {
   MgmtInt http_docs = 0;
-  MgmtInt nntp_docs = 0;
   MgmtInt ftp_docs = 0;
   MgmtInt rni_docs = 0;
   MgmtInt wmt_docs = 0;
@@ -910,12 +884,11 @@ Ag_TotalDocumentsServed()
   MgmtInt total_docs = 0;
 
   if (varIntFromName("proxy.node.http.user_agents_total_documents_served", &http_docs)
-      && varIntFromName("proxy.node.nntp.user_agents_total_documents_served", &nntp_docs)
       && varIntFromName("proxy.node.ftp.user_agents_total_documents_served", &ftp_docs)
       && varIntFromName("proxy.node.rni.user_agents_total_documents_served", &rni_docs)
       && varIntFromName("proxy.node.wmt.user_agents_total_documents_served", &wmt_docs)
       && varIntFromName("proxy.node.qt.user_agents_total_documents_served", &qt_docs)) {
-    total_docs = http_docs + nntp_docs + ftp_docs + rni_docs + wmt_docs + qt_docs;
+    total_docs = http_docs + ftp_docs + rni_docs + wmt_docs + qt_docs;
     varSetInt("proxy.node.user_agents_total_documents_served", total_docs);
   } else {
     varSetInt("proxy.node.user_agents_total_documents_served", -20);
@@ -925,7 +898,7 @@ Ag_TotalDocumentsServed()
 
 
 //
-// Aggregate client/server connections for HTTP/FTP/NNTP and RNI(?)
+// Aggregate client/server connections for HTTP/FTP and RNI(?)
 //
 void
 Ag_Connections()
@@ -934,9 +907,6 @@ Ag_Connections()
   MgmtInt http_os_server_conn = 0;
   MgmtInt http_pp_server_conn = 0;
   MgmtInt http_cache_conn = 0;
-  MgmtInt nntp_client_conn = 0;
-  MgmtInt nntp_server_conn = 0;
-  MgmtInt nntp_cache_conn = 0;
   MgmtInt ftp_client_conn = 0;
   MgmtInt ftp_server_conn = 0;
   MgmtInt ftp_cache_conn = 0;
@@ -957,9 +927,6 @@ Ag_Connections()
       && varIntFromName("proxy.node.http.origin_server_current_connections_count", &http_os_server_conn)
       && varIntFromName("proxy.node.http.current_parent_proxy_connections", &http_pp_server_conn)
       && varIntFromName("proxy.node.http.cache_current_connections_count", &http_cache_conn)
-      && varIntFromName("proxy.node.nntp.current_client_connections", &nntp_client_conn)
-      && varIntFromName("proxy.node.nntp.current_server_connections", &nntp_server_conn)
-      && varIntFromName("proxy.node.nntp.current_cache_connections", &nntp_cache_conn)
       && varIntFromName("proxy.node.ftp.current_client_connections", &ftp_client_conn)
       && varIntFromName("proxy.node.ftp.current_server_connections", &ftp_server_conn)
       && varIntFromName("proxy.node.ftp.current_cache_connections", &ftp_cache_conn)
@@ -974,11 +941,11 @@ Ag_Connections()
       && varIntFromName("proxy.node.qt.current_cache_connections", &qt_cache_conn)
 
     ) {
-    client_conn = http_ua_client_conn + nntp_client_conn + ftp_client_conn +
+    client_conn = http_ua_client_conn + ftp_client_conn +
       rni_client_conn + wmt_client_conn + qt_client_conn;
-    server_conn = http_os_server_conn + http_pp_server_conn + nntp_server_conn + ftp_server_conn +
+    server_conn = http_os_server_conn + http_pp_server_conn + ftp_server_conn +
       rni_server_conn + wmt_server_conn + qt_server_conn;
-    cache_conn = http_cache_conn + nntp_cache_conn + ftp_cache_conn + rni_cache_conn + wmt_cache_conn + qt_cache_conn;
+    cache_conn = http_cache_conn + ftp_cache_conn + rni_cache_conn + wmt_cache_conn + qt_cache_conn;
     varSetInt("proxy.node.current_client_connections", client_conn);
     varSetInt("proxy.node.current_server_connections", server_conn);
     varSetInt("proxy.node.current_cache_connections", cache_conn);
@@ -993,8 +960,8 @@ Ag_Connections()
 //
 // Calculate Node Bandwidth ratio i.e. bandwidth savings
 //
-// FIXME: Should reflext HTTP/FTP/NNTP and maybe RNI(?)
-//        Currently only reflects HTTP/FTP/NNTP
+// FIXME: Should reflext HTTP/FTP and maybe RNI(?)
+//        Currently only reflects HTTP/FTP
 //
 // NOTE: 8/21/98 (Bug INKqa03094)
 //       A special scenario is considered in this code where during fresh 
@@ -1054,16 +1021,6 @@ Ag_Bytes()
   }
 
   // What about FTP user agent?. Included in HTTP.
-  // Add NNTP User Agent request/response bytes
-  if (varIntFromName("proxy.process.nntp.downstream.request_bytes", &b) &&
-      varIntFromName("proxy.process.nntp.downstream.response_bytes", &h)) {
-    UA_bytes += h + b;
-    varSetInt("proxy.node.nntp.downstream_total_bytes", h + b);
-  } else {
-    ok = false;
-    varSetInt("proxy.node.nntp.downstream_total_bytes", -20);
-  }
-
   // Add FTP User Agent request/response bytes
   if (varIntFromName("proxy.process.ftp.downstream.request_bytes", &b) &&
       varIntFromName("proxy.process.ftp.downstream.response_bytes", &h)) {
@@ -1133,16 +1090,6 @@ Ag_Bytes()
 
   // What about FTP Origin Server? Included in HTTP
 
-  // Add NNTP origin server request/response bytes
-  if (varIntFromName("proxy.process.nntp.upstream.request_bytes", &b) &&
-      varIntFromName("proxy.process.nntp.upstream.response_bytes", &h)) {
-    OS_bytes += h + b;
-    varSetInt("proxy.node.nntp.upstream_total_bytes", h + b);
-  } else {
-    ok = false;
-    varSetInt("proxy.node.nntp.upstream_total_bytes", -20);
-  }
-
   // Add FTP origin server request/response bytes
   if (varIntFromName("proxy.process.ftp.upstream.request_bytes", &b) &&
       varIntFromName("proxy.process.ftp.upstream.response_bytes", &h)) {
@@ -1330,20 +1277,9 @@ aggregateNodeRecords()
   AgInt_generic("proxy.process.http.current_parent_proxy_connections",
                 "proxy.node.http.current_parent_proxy_connections");
 
-  // NNTP
-  AgInt_generic("proxy.process.nntp.incoming_requests", "proxy.node.nntp.user_agents_total_documents_served");
-
-  AgInt_generic("proxy.process.nntp.current_server_connections", "proxy.node.nntp.current_server_connections");
-
-  AgInt_generic("proxy.process.nntp.current_client_connections", "proxy.node.nntp.current_client_connections");
-
-  AgInt_generic("proxy.process.nntp.current_cache_connections", "proxy.node.nntp.current_cache_connections");
-
   // FTP
   AgInt_generic("proxy.process.ftp.incoming_requests", "proxy.node.ftp.user_agents_total_documents_served");
 
-  AgInt_generic("proxy.process.ftp.current_server_connections", "proxy.node.ftp.current_server_connections");
-
   AgInt_generic("proxy.process.ftp.current_client_connections", "proxy.node.ftp.current_client_connections");
 
   AgInt_generic("proxy.process.ftp.current_cache_connections", "proxy.node.ftp.current_cache_connections");

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.cc Wed Apr 28 13:54:17 2010
@@ -1820,502 +1820,6 @@ MgmtAllowObj::getCfgEleCopy()
   return (INKCfgEle *) copy_mgmt_allow_ele(m_ele);
 }
 
-//--------------------------------------------------------------------------
-// NntpAccessObj
-//--------------------------------------------------------------------------
-// If access is...   authenticator is..       user is...          pass is...
-//
-// allow             not used               not used            not used
-// deny              not used               not used            not used
-// basic             not used               required            optional
-// generic           optional               not used            not used
-// custo             required               optional(1)         optional(1)
-//  (1) but the only allowed entry is the string "required"
-NntpAccessObj::NntpAccessObj(INKNntpAccessEle * ele)
-{
-  m_ele = ele;
-  m_valid = true;
-  m_valid = isValid();
-}
-
-NntpAccessObj::NntpAccessObj(TokenList * tokens)
-{
-  Token *token;
-  // These aren't used.
-  //bool   authFound = false;
-  //bool   userFound = false;
-  //bool   passFound = false;
-
-  m_ele = INKNntpAccessEleCreate();
-  m_ele->cfg_ele.error = INK_ERR_OKAY;
-  m_valid = true;
-
-  /* what are these fields for?
-     INKStringList group_wildmat;
-     bool deny_posting;
-   */
-
-  if (!tokens || tokens->length < 2 || tokens->length > 7) {
-    goto FORMAT_ERR;
-  }
-
-  m_ele->cfg_ele.type = get_rule_type(tokens, INK_FNAME_NNTP_ACCESS);
-  if (m_ele->cfg_ele.type == INK_TYPE_UNDEFINED) {
-    goto FORMAT_ERR;
-  }
-  // First token 
-  token = tokens->first();
-  if (!strcmp(token->name, "ip")) {
-    m_ele->client_t = INK_CLIENT_GRP_IP;
-  } else if (!strcmp(token->name, "domain")) {
-    m_ele->client_t = INK_CLIENT_GRP_DOMAIN;
-  } else if (!strcmp(token->name, "hostname")) {
-    m_ele->client_t = INK_CLIENT_GRP_HOSTNAME;
-  } else {
-    m_ele->client_t = INK_CLIENT_GRP_UNDEFINED;
-  }
-  if (token->value) {
-    m_ele->clients = xstrdup(token->value);
-  } else {
-    goto FORMAT_ERR;
-  }
-
-  // Second token -- "access" 
-  token = tokens->next(token);
-  if (!strcmp(token->name, "access")) {
-    if (!strcmp(token->value, "allow")) {
-      m_ele->access = INK_NNTP_ACC_ALLOW;
-    } else if (!strcmp(token->value, "deny")) {
-      m_ele->access = INK_NNTP_ACC_DENY;
-    } else if (!strcmp(token->value, "basic")) {
-      m_ele->access = INK_NNTP_ACC_BASIC;
-    } else if (!strcmp(token->value, "generic")) {
-      m_ele->access = INK_NNTP_ACC_GENERIC;
-    } else if (!strcmp(token->value, "custom")) {
-      m_ele->access = INK_NNTP_ACC_CUSTOM;
-    } else {
-      m_ele->access = INK_NNTP_ACC_UNDEFINED;
-    }
-  } else {
-    goto FORMAT_ERR;
-  }
-
-  if (tokens->length > 2) {
-    token = tokens->next(token);
-    while (token) {
-      if (!strcmp(token->name, "authenticator")) {
-        if (token->value) {
-          m_ele->authenticator = xstrdup(token->value);
-        } else {
-          goto FORMAT_ERR;
-        }
-      } else if (!strcmp(token->name, "user")) {
-        if (token->value) {
-          m_ele->user = xstrdup(token->value);
-        } else {
-          goto FORMAT_ERR;
-        }
-      } else if (!strcmp(token->name, "pass")) {
-        if (token->value) {
-          m_ele->pass = xstrdup(token->value);
-        } else {
-          goto FORMAT_ERR;
-        }
-      } else if (!strcmp(token->name, "groups")) {
-        if (token->value) {
-          m_ele->group_wildmat = string_to_string_list(token->value, ",");
-        } else {
-          goto FORMAT_ERR;
-        }
-      } else if (!strcmp(token->name, "posting")) {
-        if (token->value && !(strcmp(token->value, "deny"))) {
-          m_ele->deny_posting = true;
-        } else {
-          goto FORMAT_ERR;
-        }
-      } else {
-        goto FORMAT_ERR;
-      }
-
-      // Get the next name/value pair 
-      token = tokens->next(token);
-    }
-  }
-  return;
-
-FORMAT_ERR:
-  m_ele->cfg_ele.error = INK_ERR_INVALID_CONFIG_RULE;
-  m_valid = false;
-}
-
-NntpAccessObj::~NntpAccessObj()
-{
-  INKNntpAccessEleDestroy(m_ele);
-}
-
-char *
-NntpAccessObj::formatEleToRule()
-{
-  if (!isValid()) {
-    m_ele->cfg_ele.error = INK_ERR_INVALID_CONFIG_RULE;
-    return NULL;
-  }
-
-  char buf[MAX_RULE_SIZE];
-  memset(buf, 0, MAX_RULE_SIZE);
-
-  switch (m_ele->client_t) {
-  case INK_CLIENT_GRP_IP:
-    strncat(buf, "ip=", sizeof(buf) - strlen(buf) - 1);
-    break;
-  case INK_CLIENT_GRP_DOMAIN:
-    strncat(buf, "domain=", sizeof(buf) - strlen(buf) - 1);
-    break;
-  case INK_CLIENT_GRP_HOSTNAME:
-    strncat(buf, "hostname=", sizeof(buf) - strlen(buf) - 1);
-    break;
-  default:
-    // Handled here:
-    // Lots of cases...
-    break;
-  }
-  strncat(buf, m_ele->clients, sizeof(buf) - strlen(buf) - 1);
-
-  strncat(buf, " access=\"", sizeof(buf) - strlen(buf) - 1);
-  switch (m_ele->access) {
-  case INK_NNTP_ACC_ALLOW:
-    strncat(buf, "allow", sizeof(buf) - strlen(buf) - 1);
-    break;
-  case INK_NNTP_ACC_DENY:
-    strncat(buf, "deny", sizeof(buf) - strlen(buf) - 1);
-    break;
-  case INK_NNTP_ACC_BASIC:
-    strncat(buf, "basic", sizeof(buf) - strlen(buf) - 1);
-    break;
-  case INK_NNTP_ACC_GENERIC:
-    strncat(buf, "generic", sizeof(buf) - strlen(buf) - 1);
-    break;
-  case INK_NNTP_ACC_CUSTOM:
-    strncat(buf, "custom", sizeof(buf) - strlen(buf) - 1);
-    break;
-  default:
-    // Handled here:
-    // INK_NNTP_ACCESS_UNDEFINED
-    break;
-  }
-  strncat(buf, "\"", sizeof(buf) - strlen(buf) - 1);
-
-  if (m_ele->authenticator) {
-    strncat(buf, " authenticator=\"", sizeof(buf) - strlen(buf) - 1);
-    strncat(buf, m_ele->authenticator, sizeof(buf) - strlen(buf) - 1);
-    strncat(buf, "\"", sizeof(buf) - strlen(buf) - 1);
-  }
-
-  if (m_ele->user) {
-    strncat(buf, " user=\"", sizeof(buf) - strlen(buf) - 1);
-    strncat(buf, m_ele->user, sizeof(buf) - strlen(buf) - 1);
-    strncat(buf, "\"", sizeof(buf) - strlen(buf) - 1);
-  }
-
-  if (m_ele->pass) {
-    strncat(buf, " pass=\"", sizeof(buf) - strlen(buf) - 1);
-    strncat(buf, m_ele->pass, sizeof(buf) - strlen(buf) - 1);
-    strncat(buf, "\"", sizeof(buf) - strlen(buf) - 1);
-  }
-
-  if (m_ele->group_wildmat) {
-    char *list = string_list_to_string(m_ele->group_wildmat, ",");
-    if (list) {
-      size_t len = strlen(buf);
-      snprintf(buf + len, sizeof(buf) - len, " groups=%s", list);
-      xfree(list);
-    }
-  }
-
-  if (m_ele->deny_posting) {
-    strncat(buf, " posting=deny", sizeof(buf) - strlen(buf) - 1);
-  }
-
-
-  return xstrdup(buf);
-}
-
-bool NntpAccessObj::isValid()
-{
-  INKIpAddrEle *
-    ipCheck;
-
-  if (m_ele->cfg_ele.error != INK_ERR_OKAY) {
-    m_valid = false;
-  }
-  // check access type
-  switch (m_ele->access) {
-  case INK_NNTP_ACC_ALLOW:
-  case INK_NNTP_ACC_DENY:
-    if (m_ele->authenticator || m_ele->user || m_ele->pass) {
-      m_valid = false;
-    }
-    break;
-  case INK_NNTP_ACC_BASIC:
-    if (!m_ele->user || m_ele->authenticator) {
-      m_valid = false;
-    }
-    break;
-  case INK_NNTP_ACC_GENERIC:
-    if (m_ele->user || m_ele->pass) {
-      m_valid = false;
-    }
-    break;
-  case INK_NNTP_ACC_CUSTOM:
-    if (!m_ele->authenticator ||
-        (m_ele->user && strcmp(m_ele->user, "required") != 0) ||
-        (m_ele->pass && strcmp(m_ele->pass, "required") != 0)) {
-      m_valid = false;
-    }
-    break;
-  default:
-    m_valid = false;
-  }
-
-  // check valid clients 
-  if (!m_ele->clients)
-    m_valid = false;
-
-  switch (m_ele->client_t) {
-  case INK_CLIENT_GRP_IP:      // the IP can be single or range
-    ipCheck = string_to_ip_addr_ele(m_ele->clients);
-    if (!ipCheck) {
-      m_valid = false;
-    } else {
-      INKIpAddrEleDestroy(ipCheck);
-    }
-    break;
-  case INK_CLIENT_GRP_DOMAIN:
-  case INK_CLIENT_GRP_HOSTNAME:
-    break;
-  default:
-    m_valid = false;
-  }
-
-  if (!m_valid)
-    m_ele->cfg_ele.error = INK_ERR_INVALID_CONFIG_RULE;
-
-  return m_valid;
-}
-
-INKCfgEle *
-NntpAccessObj::getCfgEleCopy()
-{
-  return (INKCfgEle *) copy_nntp_access_ele(m_ele);
-}
-
-//--------------------------------------------------------------------------
-// NntpSrvrObj
-//--------------------------------------------------------------------------
-NntpSrvrObj::NntpSrvrObj(INKNntpSrvrEle * ele)
-{
-  m_ele = ele;
-  m_valid = true;
-  m_valid = isValid();
-}
-
-NntpSrvrObj::NntpSrvrObj(TokenList * tokens)
-{
-  Token *token;
-  bool priFound = false;        // found the priority  tag yet? 
-  bool ifFound = false;         // found the interface tag yet? 
-
-  m_ele = INKNntpSrvrEleCreate();
-  m_ele->cfg_ele.error = INK_ERR_OKAY;
-  m_valid = true;
-
-  if (!tokens || tokens->length < 2 || tokens->length > 4) {
-    goto FORMAT_ERR;
-  }
-
-  m_ele->cfg_ele.type = get_rule_type(tokens, INK_FNAME_NNTP_SERVERS);
-  if (m_ele->cfg_ele.type == INK_TYPE_UNDEFINED) {
-    goto FORMAT_ERR;
-  }
-  // First token 
-  token = tokens->first();
-  m_ele->hostname = xstrdup(token->name);
-
-  token = tokens->next(token);
-  m_ele->group_wildmat = string_to_string_list(token->name, ",");
-
-  // assume no priority tag 
-  m_ele->treatment = INK_NNTP_TRMT_UNDEFINED;
-  m_ele->priority = 0;
-
-  token = tokens->next(token);
-  while (token) {
-    if (!strcmp(token->name, "feed")) {
-      m_ele->treatment = INK_NNTP_TRMT_FEED;
-      if (priFound)
-        goto FORMAT_ERR;
-    } else if (!strcmp(token->name, "push")) {
-      m_ele->treatment = INK_NNTP_TRMT_PUSH;
-      if (priFound)
-        goto FORMAT_ERR;
-    } else if (!strcmp(token->name, "pull")) {
-      m_ele->treatment = INK_NNTP_TRMT_PULL;
-      if (priFound)
-        goto FORMAT_ERR;
-    } else if (!strcmp(token->name, "pullover")) {
-      m_ele->treatment = INK_NNTP_TRMT_PULLOVER;
-      if (priFound)
-        goto FORMAT_ERR;
-    } else if (!strcmp(token->name, "dynamic")) {
-      m_ele->treatment = INK_NNTP_TRMT_DYNAMIC;
-      if (priFound)
-        goto FORMAT_ERR;
-    } else if (!strcmp(token->name, "post")) {
-      m_ele->treatment = INK_NNTP_TRMT_POST;
-      if (priFound)
-        goto FORMAT_ERR;
-    } else if (!strcmp(token->name, "dynamic")) {
-      m_ele->treatment = INK_NNTP_TRMT_DYNAMIC;
-      if (priFound)
-        goto FORMAT_ERR;
-    } else {
-
-      // check if the "name" consist of all integers 
-      bool allDigit = true;
-      for (int i = 0; token->name[i] != '\0'; i++) {
-        if (!isdigit(token->name[i])) {
-          allDigit = false;
-          break;
-        }
-      }
-
-      // whether we have a priority tag or a interface, OR neither 
-      if (allDigit && !priFound) {      // this is a priority integer
-        m_ele->priority = ink_atoi(token->name);
-        priFound = true;
-        if (m_ele->treatment != INK_NNTP_TRMT_UNDEFINED && m_ele->priority > 0) {
-          goto FORMAT_ERR;      //cannot specify treatment type and priority
-        }
-      } else if (!allDigit && !ifFound) {
-        m_ele->interface = xstrdup(token->name);
-        ifFound = true;
-      } else {
-        goto FORMAT_ERR;
-      }
-    }                           // end "else" 
-    token = tokens->next(token);
-  }                             // end "while"
-  return;
-
-FORMAT_ERR:
-  m_ele->cfg_ele.error = INK_ERR_INVALID_CONFIG_RULE;
-  m_valid = false;
-}
-
-NntpSrvrObj::~NntpSrvrObj()
-{
-  INKNntpSrvrEleDestroy(m_ele);
-}
-
-char *
-NntpSrvrObj::formatEleToRule()
-{
-  if (!isValid()) {
-    m_ele->cfg_ele.error = INK_ERR_INVALID_CONFIG_RULE;
-    return NULL;
-  }
-
-  char *listStr;
-  char buf[MAX_RULE_SIZE];
-  memset(buf, 0, MAX_RULE_SIZE);
-
-  ink_strncpy(buf, m_ele->hostname, sizeof(buf));
-  strncat(buf, " ", sizeof(buf) - strlen(buf) - 1);
-  listStr = string_list_to_string(m_ele->group_wildmat, ",");
-  if (listStr) {
-    strncat(buf, listStr, sizeof(buf) - strlen(buf) - 1);
-    xfree(listStr);
-  }
-
-  switch (m_ele->treatment) {
-  case INK_NNTP_TRMT_FEED:
-    strncat(buf, " feed", sizeof(buf) - strlen(buf) - 1);
-    break;
-  case INK_NNTP_TRMT_PUSH:
-    strncat(buf, " push", sizeof(buf) - strlen(buf) - 1);
-    break;
-  case INK_NNTP_TRMT_PULL:
-    strncat(buf, " pull", sizeof(buf) - strlen(buf) - 1);
-    break;
-  case INK_NNTP_TRMT_PULLOVER:
-    strncat(buf, " pullover", sizeof(buf) - strlen(buf) - 1);
-    break;
-  case INK_NNTP_TRMT_DYNAMIC:
-    strncat(buf, " dynamic", sizeof(buf) - strlen(buf) - 1);
-    break;
-  case INK_NNTP_TRMT_POST:
-    strncat(buf, " post", sizeof(buf) - strlen(buf) - 1);
-    break;
-  case INK_NNTP_TRMT_UNDEFINED:
-    if (m_ele->priority > 0) {
-      size_t pos = strlen(buf);
-      snprintf(buf + pos, sizeof(buf) - pos, " %d", m_ele->priority);
-    }
-    break;
-  }
-
-  if (m_ele->interface) {
-    strncat(buf, " ", sizeof(buf) - strlen(buf) - 1);
-    strncat(buf, m_ele->interface, sizeof(buf) - strlen(buf) - 1);
-  }
-
-  return xstrdup(buf);
-}
-
-bool NntpSrvrObj::isValid()
-{
-  if (m_ele->cfg_ele.error != INK_ERR_OKAY) {
-    m_valid = false;
-  }
-
-  if (!m_ele->hostname) {
-    m_valid = false;
-  }
-
-  if (!m_ele->group_wildmat) {
-    m_valid = false;
-  }
-  // the treatment/priority are optional arguments
-  switch (m_ele->treatment) {
-  case INK_NNTP_TRMT_FEED:
-  case INK_NNTP_TRMT_PUSH:
-  case INK_NNTP_TRMT_PULL:
-  case INK_NNTP_TRMT_PULLOVER:
-  case INK_NNTP_TRMT_DYNAMIC:
-  case INK_NNTP_TRMT_POST:
-    if (m_ele->priority != 0) { // by default, the priority is 0 
-      m_valid = false;
-    }
-    break;
-  case INK_NNTP_TRMT_UNDEFINED:
-    break;
-  default:
-    m_valid = false;
-  }
-
-  // m_ele->interface is an optional arguement 
-
-  if (!m_valid)
-    m_ele->cfg_ele.error = INK_ERR_INVALID_CONFIG_RULE;
-
-  return m_valid;
-}
-
-INKCfgEle *
-NntpSrvrObj::getCfgEleCopy()
-{
-  return (INKCfgEle *) copy_nntp_srvr_ele(m_ele);
-}
 
 //--------------------------------------------------------------------------
 // ParentProxyObj

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.h Wed Apr 28 13:54:17 2010
@@ -414,54 +414,6 @@ private:
   INKMgmtAllowEle * m_ele;
 };
 
-/* nntp_access.config  *******************************************/
-class NntpAccessObj:public CfgEleObj
-{
-public:
-  NntpAccessObj(INKNntpAccessEle * ele);
-  NntpAccessObj(TokenList * tokens);
-  ~NntpAccessObj();
-
-  virtual char *formatEleToRule();
-  virtual bool isValid();
-  virtual INKCfgEle *getCfgEleCopy();
-  virtual INKCfgEle *getCfgEle()
-  {
-    return (INKCfgEle *) m_ele;
-  }
-  virtual INKRuleTypeT getRuleType()
-  {
-    return m_ele->cfg_ele.type;
-  }
-
-private:
-  INKNntpAccessEle * m_ele;
-};
-
-/* nntp_servers.config *******************************************/
-class NntpSrvrObj:public CfgEleObj
-{
-public:
-  NntpSrvrObj(INKNntpSrvrEle * ele);
-  NntpSrvrObj(TokenList * tokens);
-  ~NntpSrvrObj();
-
-  virtual char *formatEleToRule();
-  virtual bool isValid();
-  virtual INKCfgEle *getCfgEleCopy();
-  virtual INKCfgEle *getCfgEle()
-  {
-    return (INKCfgEle *) m_ele;
-  }
-  virtual INKRuleTypeT getRuleType()
-  {
-    return m_ele->cfg_ele.type;
-  }
-
-private:
-  INKNntpSrvrEle * m_ele;
-};
-
 /* parent.config       *******************************************/
 class ParentProxyObj:public CfgEleObj
 {

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextUtils.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextUtils.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextUtils.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextUtils.cc Wed Apr 28 13:54:17 2010
@@ -1549,15 +1549,6 @@ filename_to_string(INKFileNameT file)
   case INK_FNAME_MGMT_ALLOW:
     return xstrdup("mgmt_allow.config");
 
-  case INK_FNAME_NNTP_ACCESS:
-    return xstrdup("nntp_access.config");
-
-  case INK_FNAME_NNTP_SERVERS:
-    return xstrdup("nntp_servers.config");
-
-  case INK_FNAME_NNTP_CONFIG_XML:
-    return xstrdup("nntp_config.xml");
-
   case INK_FNAME_PARENT_PROXY:
     return xstrdup("parent.config");
 
@@ -1602,60 +1593,6 @@ filename_to_string(INKFileNameT file)
 }
 
 /* ------------------------------------------------------------------------- 
- * nntp_acc_type_to_string
- * -------------------------------------------------------------------------
- */
-char *
-nntp_acc_type_to_string(INKNntpAccessT acc)
-{
-  switch (acc) {
-  case INK_NNTP_ACC_ALLOW:
-    return xstrdup("allow");
-    break;
-  case INK_NNTP_ACC_DENY:
-    return xstrdup("deny");
-    break;
-  case INK_NNTP_ACC_BASIC:
-    return xstrdup("basic");
-    break;
-  case INK_NNTP_ACC_GENERIC:
-    return xstrdup("generic");
-    break;
-  case INK_NNTP_ACC_CUSTOM:
-    return xstrdup("custom");
-    break;
-  default:
-    break;
-  }
-
-  return NULL;
-}
-
-/* ------------------------------------------------------------------------- 
- * string_to_nntp_treat_type
- * -------------------------------------------------------------------------
- */
-INKNntpTreatmentT
-string_to_nntp_treat_type(const char *treat)
-{
-  if (strcasecmp(treat, "feed") == 0) {
-    return INK_NNTP_TRMT_FEED;
-  } else if (strcasecmp(treat, "push") == 0) {
-    return INK_NNTP_TRMT_PUSH;
-  } else if (strcasecmp(treat, "pull") == 0) {
-    return INK_NNTP_TRMT_PULL;
-  } else if (strcasecmp(treat, "pullover") == 0) {
-    return INK_NNTP_TRMT_PULLOVER;
-  } else if (strcasecmp(treat, "dynamic") == 0) {
-    return INK_NNTP_TRMT_DYNAMIC;
-  } else if (strcasecmp(treat, "port") == 0) {
-    return INK_NNTP_TRMT_POST;
-  }
-
-  return INK_NNTP_TRMT_UNDEFINED;
-}
-
-/* ------------------------------------------------------------------------- 
  * string_to_congest_scheme_type
  * -------------------------------------------------------------------------
  */
@@ -2168,12 +2105,6 @@ create_ele_obj_from_rule_node(Rule * rul
   case INK_MGMT_ALLOW:         /* mgmt_allow.config */
     ele = (CfgEleObj *) new MgmtAllowObj(token_list);
     break;
-  case INK_NNTP_ACCESS:        /* nntp_access.config */
-    ele = (CfgEleObj *) new NntpAccessObj(token_list);
-    break;
-  case INK_NNTP_SERVERS:       /* nntp_servers.config */
-    ele = (CfgEleObj *) new NntpSrvrObj(token_list);
-    break;
   case INK_PP_PARENT:          /* parent.config */
   case INK_PP_GO_DIRECT:
     ele = (CfgEleObj *) new ParentProxyObj(token_list);
@@ -2309,14 +2240,6 @@ create_ele_obj_from_ele(INKCfgEle * ele)
     ele_obj = (CfgEleObj *) new MgmtAllowObj((INKMgmtAllowEle *) ele);
     break;
 
-  case INK_NNTP_ACCESS:        /* nntp_access.config */
-    ele_obj = (CfgEleObj *) new NntpAccessObj((INKNntpAccessEle *) ele);
-    break;
-
-  case INK_NNTP_SERVERS:       /* nntp_servers.config */
-    ele_obj = (CfgEleObj *) new NntpSrvrObj((INKNntpSrvrEle *) ele);
-    break;
-
   case INK_PP_PARENT:          /* parent.config */
   case INK_PP_GO_DIRECT:       // fall-through
     ele_obj = (CfgEleObj *) new ParentProxyObj((INKParentProxyEle *) ele);
@@ -2493,12 +2416,6 @@ get_rule_type(TokenList * token_list, IN
   case INK_FNAME_MGMT_ALLOW:   /* mgmt_allow.config */
     return INK_MGMT_ALLOW;
 
-  case INK_FNAME_NNTP_ACCESS:  /* nnpt_access.config */
-    return INK_NNTP_ACCESS;
-
-  case INK_FNAME_NNTP_SERVERS: /* nntp_servers.config */
-    return INK_NNTP_SERVERS;
-
   case INK_FNAME_PARENT_PROXY: /* parent.config */
     // search fro go_direct action name and recongize the value-> ture or false
     for (tok = token_list->first(); tok; tok = token_list->next(tok)) {
@@ -3104,56 +3021,6 @@ copy_log_object_ele(INKLogObjectEle * el
   return nele;
 }
 
-INKNntpAccessEle *
-copy_nntp_access_ele(INKNntpAccessEle * ele)
-{
-  if (!ele) {
-    return NULL;
-  }
-
-  INKNntpAccessEle *nele = INKNntpAccessEleCreate();
-  if (!nele)
-    return NULL;
-
-  copy_cfg_ele(&(ele->cfg_ele), &(nele->cfg_ele));
-  nele->client_t = INK_CLIENT_GRP_UNDEFINED;
-  if (ele->clients)
-    nele->clients = xstrdup(ele->clients);
-  nele->access = INK_NNTP_ACC_UNDEFINED;
-  if (ele->authenticator)
-    nele->authenticator = xstrdup(ele->authenticator);
-  if (ele->user)
-    nele->user = xstrdup(ele->user);
-  if (ele->pass)
-    nele->pass = xstrdup(ele->pass);
-  nele->group_wildmat = copy_string_list(ele->group_wildmat);
-  nele->deny_posting = false;
-
-  return nele;
-}
-
-INKNntpSrvrEle *
-copy_nntp_srvr_ele(INKNntpSrvrEle * ele)
-{
-  if (!ele) {
-    return NULL;
-  }
-
-  INKNntpSrvrEle *nele = INKNntpSrvrEleCreate();
-  if (!nele)
-    return NULL;
-
-  copy_cfg_ele(&(ele->cfg_ele), &(nele->cfg_ele));
-  if (ele->hostname)
-    nele->hostname = xstrdup(ele->hostname);
-  nele->group_wildmat = copy_string_list(ele->group_wildmat);
-  nele->treatment = ele->treatment;
-  nele->priority = ele->priority;
-  nele->interface = xstrdup(ele->interface);
-
-  return nele;
-}
-
 INKParentProxyEle *
 copy_parent_proxy_ele(INKParentProxyEle * ele)
 {

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextUtils.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextUtils.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextUtils.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextUtils.h Wed Apr 28 13:54:17 2010
@@ -125,8 +125,6 @@ char *round_robin_type_to_string(INKRrT 
 /* INKFileNameT <==> string */
 char *filename_to_string(INKFileNameT file);
 
-char *nntp_acc_type_to_string(INKNntpAccessT acc);
-INKNntpTreatmentT string_to_nntp_treat_type(const char *treat);
 INKCongestionSchemeT string_to_congest_scheme_type(const char *scheme);
 
 INKAccessT string_to_admin_acc_type(const char *access);
@@ -192,8 +190,6 @@ INKLogFilterEle *copy_log_filter_ele(INK
 INKLogFormatEle *copy_log_format_ele(INKLogFormatEle * ele);
 INKLogObjectEle *copy_log_object_ele(INKLogObjectEle * ele);
 INKMgmtAllowEle *copy_mgmt_allow_ele(INKMgmtAllowEle * ele);
-INKNntpAccessEle *copy_nntp_access_ele(INKNntpAccessEle * ele);
-INKNntpSrvrEle *copy_nntp_srvr_ele(INKNntpSrvrEle * ele);
 INKParentProxyEle *copy_parent_proxy_ele(INKParentProxyEle * ele);
 INKPartitionEle *copy_partition_ele(INKPartitionEle * ele);
 INKPluginEle *copy_plugin_ele(INKPluginEle * ele);

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPIShared.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPIShared.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPIShared.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPIShared.cc Wed Apr 28 13:54:17 2010
@@ -440,8 +440,6 @@ get_event_id(const char *event_name)
     return MGMT_ALARM_PROXY_LOGGING_ERROR;
   } else if (strcmp("MGMT_ALARM_PROXY_LOGGING_WARNING", event_name) == 0) {
     return MGMT_ALARM_PROXY_LOGGING_WARNING;
-  } else if (strcmp("MGMT_ALARM_PROXY_NNTP_ERROR", event_name) == 0) {
-    return MGMT_ALARM_PROXY_NNTP_ERROR;
   } else if (strcmp("MGMT_ALARM_PROXY_FTP_ERROR", event_name) == 0) {
     return MGMT_ALARM_PROXY_FTP_ERROR;
   } else if (strcmp("MGMT_ALARM_MGMT_TEST", event_name) == 0) {
@@ -503,9 +501,6 @@ get_event_name(int id)
   case MGMT_ALARM_PROXY_LOGGING_WARNING:
     ink_strncpy(name, "MGMT_ALARM_PROXY_LOGGING_WARNING", sizeof(name));
     break;
-  case MGMT_ALARM_PROXY_NNTP_ERROR:
-    ink_strncpy(name, "MGMT_ALARM_PROXY_NNTP_ERROR", sizeof(name));
-    break;
   case MGMT_ALARM_PROXY_FTP_ERROR:
     ink_strncpy(name, "MGMT_ALARM_PROXY_FTP_ERROR", sizeof(name));
     break;

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPIShared.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPIShared.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPIShared.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPIShared.h Wed Apr 28 13:54:17 2010
@@ -56,7 +56,7 @@
 #define MGMT_ALARM_PROXY_CACHE_WARNING           9
 #define MGMT_ALARM_PROXY_LOGGING_ERROR           10
 #define MGMT_ALARM_PROXY_LOGGING_WARNING         11
-#define MGMT_ALARM_PROXY_NNTP_ERROR	         12
+// Currently unused: 12
 #define MGMT_ALARM_MGMT_TEST                     13
 #define MGMT_ALARM_CONFIG_UPDATE_FAILED          14
 #define MGMT_ALARM_WEB_ERROR                     15

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.cc Wed Apr 28 13:54:17 2010
@@ -228,10 +228,6 @@ Rule::parse(const char *const_rule, INKF
     return logs_xmlParse(rule);
   case INK_FNAME_MGMT_ALLOW:   /* mgmt_allow.config */
     return mgmt_allowParse(rule);
-  case INK_FNAME_NNTP_ACCESS:  /* nnpt_access.config */
-    return nntp_accessParse(rule);
-  case INK_FNAME_NNTP_SERVERS: /* nntp_servers.config */
-    return nntp_serversParse(rule);
   case INK_FNAME_PARENT_PROXY: /* parent.config */
     return parentParse(rule);
   case INK_FNAME_PARTITION:    /* partition.config */
@@ -694,60 +690,6 @@ Rule::mgmt_allowParse(char *rule)
 
 
 /**
- * nntp_accessParse
- **/
-TokenList *
-Rule::nntp_accessParse(char *rule)
-{
-  return cacheParse(rule, 2, 7);
-}
-
-
-/**
- * nntp_serversParse
- **/
-TokenList *
-Rule::nntp_serversParse(char *rule)
-{
-  // ASSUMPTIONS:
-  //   NO SPACE around ","
-  //   at least 2; at most 4 fields
-  Tokenizer ruleTok(" \t");
-  int numRuleTok = ruleTok.Initialize(rule);
-  tok_iter_state ruleTok_state;
-  const char *tokenStr = ruleTok.iterFirst(&ruleTok_state);
-
-  if (strstr(rule, ", ")) {
-    setErrorHint("Expecting no space after ','");
-    return NULL;
-  }
-  if (strstr(rule, " ,")) {
-    setErrorHint("Expecting no space before ','");
-    return NULL;
-  }
-  if (numRuleTok < 2) {
-    setErrorHint("Expecting at least 2 space delimited tokens");
-    return NULL;
-  }
-  if (numRuleTok > 4) {
-    setErrorHint("Expecting at most 4 space delimited tokens");
-    return NULL;
-  }
-
-  Token *token;
-  TokenList *m_tokenList = NEW(new TokenList());
-
-  for (; tokenStr; tokenStr = ruleTok.iterNext(&ruleTok_state)) {
-    token = NEW(new Token());
-    token->setName(tokenStr);
-    m_tokenList->enqueue(token);
-  }
-
-  return m_tokenList;
-}
-
-
-/**
  * parentParse
  **/
 TokenList *
@@ -1284,10 +1226,6 @@ RuleList::parse(char *fileBuf, const cha
     m_filetype = INK_FNAME_LOGS_XML;    /* logs_xml.config */
   } else if (strstr(filename, "mgmt_allow.config")) {
     m_filetype = INK_FNAME_MGMT_ALLOW;  /* mgmt_allow.config */
-  } else if (strstr(filename, "nntp_access.config")) {
-    m_filetype = INK_FNAME_NNTP_ACCESS; /* nnpt_access.config */
-  } else if (strstr(filename, "nntp_servers.config")) {
-    m_filetype = INK_FNAME_NNTP_SERVERS;        /* nntp_servers.config */
   } else if (strstr(filename, "parent.config")) {
     m_filetype = INK_FNAME_PARENT_PROXY;        /* parent.config */
   } else if (strstr(filename, "partition.config")) {

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.h Wed Apr 28 13:54:17 2010
@@ -218,8 +218,6 @@ private:
   TokenList *ip_allowParse(char *rule);
   TokenList *logs_xmlParse(char *rule);
   TokenList *mgmt_allowParse(char *rule);
-  TokenList *nntp_accessParse(char *rule);
-  TokenList *nntp_serversParse(char *rule);
   TokenList *partitionParse(char *rule);
   TokenList *logsParse(char *rule);
   TokenList *pluginParse(char *rule);

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPI.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPI.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPI.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPI.cc Wed Apr 28 13:54:17 2010
@@ -1449,92 +1449,6 @@ INKMgmtAllowEleDestroy(INKMgmtAllowEle *
 
 }
 
-/*-------------------------------------------------------------
- * INKNntpAccessEle
- *-------------------------------------------------------------*/
-inkapi INKNntpAccessEle *
-INKNntpAccessEleCreate()
-{
-
-  INKNntpAccessEle *ele;
-
-  ele = (INKNntpAccessEle *) xmalloc(sizeof(INKNntpAccessEle));
-  if (!ele)
-    return NULL;
-
-  ele->cfg_ele.type = INK_NNTP_ACCESS;
-  ele->cfg_ele.error = INK_ERR_OKAY;
-  ele->client_t = INK_CLIENT_GRP_UNDEFINED;
-  ele->clients = NULL;
-  ele->access = INK_NNTP_ACC_UNDEFINED;
-  ele->authenticator = NULL;
-  ele->user = NULL;
-  ele->pass = NULL;
-  ele->group_wildmat = INK_INVALID_LIST;
-  ele->deny_posting = false;
-
-  return ele;
-}
-
-inkapi void
-INKNntpAccessEleDestroy(INKNntpAccessEle * ele)
-{
-  if (ele) {
-    if (ele->clients)
-      xfree(ele->clients);
-    if (ele->authenticator)
-      xfree(ele->authenticator);
-    if (ele->user)
-      xfree(ele->user);
-    if (ele->pass)
-      xfree(ele->pass);
-    if (ele->group_wildmat)
-      INKStringListDestroy(ele->group_wildmat);
-    xfree(ele);
-  }
-
-  return;
-}
-
-/*-------------------------------------------------------------
- * INKNntpSrvrEle
- *-------------------------------------------------------------*/
-inkapi INKNntpSrvrEle *
-INKNntpSrvrEleCreate()
-{
-
-  INKNntpSrvrEle *ele;
-
-  ele = (INKNntpSrvrEle *) xmalloc(sizeof(INKNntpSrvrEle));
-  if (!ele)
-    return NULL;
-
-  ele->cfg_ele.type = INK_NNTP_SERVERS;
-  ele->cfg_ele.error = INK_ERR_OKAY;
-  ele->hostname = NULL;
-  ele->group_wildmat = INK_INVALID_LIST;
-  ele->treatment = INK_NNTP_TRMT_UNDEFINED;
-  ele->priority = 0;
-  ele->interface = NULL;
-
-  return ele;
-}
-
-inkapi void
-INKNntpSrvrEleDestroy(INKNntpSrvrEle * ele)
-{
-  if (ele) {
-    if (ele->hostname)
-      xfree(ele->hostname);
-    if (ele->interface)
-      xfree(ele->interface);
-    if (ele->group_wildmat)
-      INKStringListDestroy(ele->group_wildmat);
-    xfree(ele);
-  }
-
-  return;
-}
 
 /*-------------------------------------------------------------
  * INKParentProxyEleCreate

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPIStub.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPIStub.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPIStub.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPIStub.cc Wed Apr 28 13:54:17 2010
@@ -463,30 +463,6 @@ INKLogObjectEleDestroy(INKLogObjectEle *
   return;
 }
 
-inkapi INKNntpAccessEle *
-INKNntpAccessEleCreate()
-{
-  return NULL;
-}
-
-inkapi void
-INKNntpAccessEleDestroy(INKNntpAccessEle * ele)
-{
-  return;
-}
-
-inkapi INKNntpSrvrEle *
-INKNntpSrvrEleCreate()
-{
-  return NULL;
-}
-
-inkapi void
-INKNntpSrvrEleDestroy(INKNntpSrvrEle * ele)
-{
-  return;
-}
-
 inkapi INKParentProxyEle *
 INKParentProxyEleCreate()
 {

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h Wed Apr 28 13:54:17 2010
@@ -336,16 +336,6 @@ typedef enum
     INK_MGMT_ALLOW_UNDEFINED
   } INKMgmtAllowT;
 
-  typedef enum                  /* access privileges to news articles cached by Traffic Server  */
-  {
-    INK_NNTP_ACC_ALLOW,
-    INK_NNTP_ACC_DENY,
-    INK_NNTP_ACC_BASIC,
-    INK_NNTP_ACC_GENERIC,
-    INK_NNTP_ACC_CUSTOM,
-    INK_NNTP_ACC_UNDEFINED
-  } INKNntpAccessT;
-
   typedef enum                  /* methods of specifying groups of clients */
   {
     INK_CLIENT_GRP_IP,          /* ip range */
@@ -354,17 +344,6 @@ typedef enum
     INK_CLIENT_GRP_UNDEFINED
   } INKClientGroupT;
 
-  typedef enum                  /* specifies how to treate specified host and news groups */
-  {
-    INK_NNTP_TRMT_FEED,         /* receive news feeds as parent NNTP receives news feeds */
-    INK_NNTP_TRMT_PUSH,         /* receive news feeds and cache articles on demand */
-    INK_NNTP_TRMT_PULL,         /* actively caches all articles specified at the specified frequency */
-    INK_NNTP_TRMT_PULLOVER,     /* actively pulls overview database for the newsgroups; retrives news articles on demand */
-    INK_NNTP_TRMT_DYNAMIC,      /* automatically decides if group should be pull, pullover, or demand-based retrieval */
-    INK_NNTP_TRMT_POST,         /* articles to be posted to specified news groups are sent to specified server */
-    INK_NNTP_TRMT_UNDEFINED
-  } INKNntpTreatmentT;
-
   typedef enum
   {
     INK_RR_TRUE,                /* go through parent cache list in round robin */
@@ -443,9 +422,6 @@ typedef enum
     INK_FNAME_IP_ALLOW,         /* ip_allow.config */
     INK_FNAME_LOGS_XML,         /* logs_xml.config */
     INK_FNAME_MGMT_ALLOW,       /* mgmt_allow.config */
-    INK_FNAME_NNTP_ACCESS,      /* nnpt_access.config */
-    INK_FNAME_NNTP_SERVERS,     /* nntp_servers.config */
-    INK_FNAME_NNTP_CONFIG_XML,  /* nntp_config.xml */
     INK_FNAME_PARENT_PROXY,     /* parent.config */
     INK_FNAME_PARTITION,        /* partition.config */
     INK_FNAME_PLUGIN,           /* plugin.config */
@@ -494,8 +470,6 @@ typedef enum
     INK_LOG_OBJECT,
     INK_LOG_FORMAT,
     INK_MGMT_ALLOW,             /* mgmt_allow.config */
-    INK_NNTP_ACCESS,            /* nntp_access.config */
-    INK_NNTP_SERVERS,           /* nntp_servers.config */
     INK_PP_PARENT,              /* parent.config */
     INK_PP_GO_DIRECT,
     INK_PARTITION,              /* partition.config */
@@ -842,38 +816,6 @@ typedef enum
     INKMgmtAllowT action;
   } INKMgmtAllowEle;
 
-/* nntp_access.config */
-  typedef struct
-  {
-    INKCfgEle cfg_ele;
-    INKClientGroupT client_t;   /* can specify client group by ip range, domain, or host name: INK_CLIENT_GRP_xxx */
-    char *clients;              /* client group value ("0.0.0.0 - 255.255.255.255" || "myhost.mydomain.com") */
-    INKNntpAccessT access;      /* allow, deny, basic, generic, custom (INK_NNTP_ACC_xxx) */
-    char *authenticator;        /* optional for GENERIC, required for CUSTOM (see admin guide) */
-    char *user;                 /* required for BASIC, equals 'required' for CUSTOM */
-    char *pass;                 /* optional for BASIC, equals 'required' for CUSTOM */
-    INKStringList group_wildmat;        /*(optional) use when restricting clients to a subset of groups; using "*" as wildcard  */
-    bool deny_posting;          /* (optional) use when restricting clients to a subset of groups */
-  } INKNntpAccessEle;
-
-
-/* nntp_server.config */
-  typedef struct
-  {
-    INKCfgEle cfg_ele;
-    char *hostname;             /* nntp server (hostname, hostname:port, ip, ip:port, .block) 
-                                   ( .block used to block access to specific news groups) */
-    INKStringList group_wildmat;        /* groups to cache; list of group names in wildmat format; use "*" as
-                                           wild-card, use prefix "!" to indicate groups not
-                                           indicated in list */
-    INKNntpTreatmentT treatment;        /* (optional) tells Traffic Server how to  treat the specified host 
-                                           and news group; if not indicated, articles from specified 
-                                           newsgroup are cached on demand */
-    int priority;               /* an integer value used when treatment is INK_NNTP_TRMT_PRIO */
-    char *interface;            /* the network interface the Traffic Server uses to contact the
-                                   parent NNTP server (1.2.3.4 or news.host.com) (can be NULL) */
-  } INKNntpSrvrEle;
-
 /* parent.config */
   typedef struct
   {
@@ -1159,10 +1101,6 @@ typedef enum
   inkapi void INKLogObjectEleDestroy(INKLogObjectEle * ele);
   inkapi INKMgmtAllowEle *INKMgmtAllowEleCreate();
   inkapi void INKMgmtAllowEleDestroy(INKMgmtAllowEle * ele);
-  inkapi INKNntpAccessEle *INKNntpAccessEleCreate();
-  inkapi void INKNntpAccessEleDestroy(INKNntpAccessEle * ele);
-  inkapi INKNntpSrvrEle *INKNntpSrvrEleCreate();
-  inkapi void INKNntpSrvrEleDestroy(INKNntpSrvrEle * ele);
   inkapi INKParentProxyEle *INKParentProxyEleCreate(INKRuleTypeT type);
   inkapi void INKParentProxyEleDestroy(INKParentProxyEle * ele);
   inkapi INKPartitionEle *INKPartitionEleCreate();

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc Wed Apr 28 13:54:17 2010
@@ -696,43 +696,6 @@ print_mgmt_allow_ele(INKMgmtAllowEle * e
 }
 
 void
-print_nntp_access_ele(INKNntpAccessEle * ele)
-{
-  if (!ele) {
-    printf("can't print ele\n");
-  }
-
-  printf("Client Group: %d\n", ele->client_t);
-  printf("Clients: %s\n", ele->clients);
-  printf("Access Type: %d\n", ele->access);
-  if (ele->authenticator)
-    printf("authenticator: %s\n", ele->authenticator);
-  if (ele->user)
-    printf("user: %s\n", ele->user);
-  if (ele->pass)
-    printf("pass: %s\n", ele->pass);
-  if (ele->group_wildmat)
-    print_string_list(ele->group_wildmat);
-  printf("deny posting? %d\n", ele->deny_posting);
-}
-
-void
-print_nntp_servers_ele(INKNntpSrvrEle * ele)
-{
-  if (!ele) {
-    printf("can't print ele\n");
-  }
-
-  printf("NNTP server: %s\n", ele->hostname);
-  print_string_list(ele->group_wildmat);
-  printf("INKNntpTreatmentT: %d\n", ele->treatment);
-  printf("priority: %d\n", ele->priority);
-  if (ele->interface)
-    printf("interface: %s\n", ele->interface);
-
-}
-
-void
 print_parent_ele(INKParentProxyEle * ele)
 {
   if (!ele) {
@@ -1065,12 +1028,6 @@ print_ele_list(INKFileNameT file, INKCfg
     case INK_FNAME_MGMT_ALLOW:
       print_mgmt_allow_ele((INKMgmtAllowEle *) ele);
       break;
-    case INK_FNAME_NNTP_ACCESS:
-      print_nntp_access_ele((INKNntpAccessEle *) ele);
-      break;
-    case INK_FNAME_NNTP_SERVERS:
-      print_nntp_servers_ele((INKNntpSrvrEle *) ele);
-      break;
     case INK_FNAME_PARENT_PROXY:
       print_parent_ele((INKParentProxyEle *) ele);
       break;
@@ -1229,11 +1186,6 @@ test_action_need(void)
   printf("[INKRecordSetInt] proxy.config.cluster.cluster_port\n\tAction Should: [%d]\n\tAction is    : [%d]\n",
          INK_ACTION_RESTART, action);
 
-  // RU_RESTART_TC record
-  INKRecordSetInt("proxy.config.nntp.enabled", 1, &action);
-  printf("[INKRecordSetInt] proxy.config.nntp.enabled\n\tAction Should: [%d]\n\tAction is    : [%d]\n",
-         INK_ACTION_SHUTDOWN, action);
-
 }
 
 /***************************************************************************
@@ -1839,10 +1791,6 @@ test_cfg_context_get(char *args)
     file = INK_FNAME_LOGS_XML;
   } else if (strcmp(name, "mgmt_allow.config") == 0) {
     file = INK_FNAME_MGMT_ALLOW;
-  } else if (strcmp(name, "nntp_access.config") == 0) {
-    file = INK_FNAME_NNTP_ACCESS;
-  } else if (strcmp(name, "nntp_servers.config") == 0) {
-    file = INK_FNAME_NNTP_SERVERS;
   } else if (strcmp(name, "parent.config") == 0) {
     file = INK_FNAME_PARENT_PROXY;
   } else if (strcmp(name, "partition.config") == 0) {
@@ -1923,10 +1871,6 @@ test_cfg_context_move(char *args)
     file = INK_FNAME_LOGS_XML;
   } else if (strcmp(name, "mgmt_allow.config") == 0) {
     file = INK_FNAME_MGMT_ALLOW;
-  } else if (strcmp(name, "nntp_access.config") == 0) {
-    file = INK_FNAME_NNTP_ACCESS;
-  } else if (strcmp(name, "nntp_servers.config") == 0) {
-    file = INK_FNAME_NNTP_SERVERS;
   } else if (strcmp(name, "parent.config") == 0) {
     file = INK_FNAME_PARENT_PROXY;
   } else if (strcmp(name, "partition.config") == 0) {
@@ -2570,15 +2514,6 @@ set_stats()
   INKRecordSetInt("proxy.cluster.http.cache_total_hits", 110, &action);
   INKRecordSetInt("proxy.cluster.http.cache_total_misses", 110, &action);
   INKRecordSetInt("proxy.cluster.http.throughput", 110, &action);
-
-  INKRecordSetFloat("proxy.process.nntp.transaction_totaltime.miss_cold", 110, &action);
-  INKRecordSetFloat("proxy.process.nntp.transaction_totaltime.hit_fresh", 110, &action);
-
-  INKRecordSetInt("proxy.process.nntp.client_bytes_written", 110, &action);
-  INKRecordSetInt("proxy.process.nntp.client_bytes_read", 110, &action);
-  INKRecordSetInt("proxy.process.nntp.client_bytes_written", 110, &action);
-  INKRecordSetInt("proxy.process.nntp.server_connections_currently_open", 110, &action);
-
 }
 
 void
@@ -2648,14 +2583,6 @@ print_stats()
   fprintf(stderr, "%f, %f, %f, %f, %f, %f\n", f1, f2, f3, f4, f5, f6);
   fprintf(stderr, "%lld, %lld, %lld, %lld, %lld\n", i1, i2, i3, i4, i5);
 
-  INKRecordGetFloat("proxy.process.nntp.transf_totaltime.miss_cold", &f1);
-  INKRecordGetFloat("proxy.process.nntp.transf_totaltime.hit_fresh", &f2);
-
-  INKRecordGetInt("proxy.process.nntp.client_bytes_written", &i1);
-  INKRecordGetInt("proxy.process.nntp.client_bytes_read", &i2);
-  INKRecordGetInt("proxy.process.nntp.client_bytes_written", &i3);
-  INKRecordGetInt("proxy.process.nntp.server_connections_currently_open", &i4);
-
   fprintf(stderr, "PROCESS stats: \n");
   fprintf(stderr, "%f, %f\n", f1, f2);
   fprintf(stderr, "%lld, %lld, %lld, %lld\n", i1, i2, i3, i4);
@@ -2692,10 +2619,6 @@ sync_test()
   else
     printf("[INKRecordSet] proxy.config.http.cache.fuzz.probability=-0.3333\n");
 
-  INKRecordSetInt("proxy.config.nntp.cache_enabled", 0, &action);
-  printf("[INKRecordSetInt] proxy.config.nntp.enabled\n\tAction Should: [%d]\n\tAction is    : [%d]\n",
-         INK_ACTION_SHUTDOWN, action);
-
 #if 1
   INKError ret;
   if ((ret = INKProxyStateSet(INK_PROXY_OFF, INK_CACHE_CLEAR_OFF)) != INK_ERR_OKAY)

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/RemoteTestOem.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/RemoteTestOem.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/RemoteTestOem.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/RemoteTestOem.cc Wed Apr 28 13:54:17 2010
@@ -77,11 +77,6 @@ test_action_need(void)
   printf("[INKRecordSetInt] proxy.config.cluster.cluster_port\n\tAction Should: [%d]\n\tAction is    : [%d]\n",
          INK_ACTION_RESTART, action);
 
-  // RU_RESTART_TC record
-  INKRecordSetInt("proxy.config.nntp.enabled", 1, &action);
-  printf("[INKRecordSetInt] proxy.config.nntp.enabled\n\tAction Should: [%d]\n\tAction is    : [%d]\n",
-         INK_ACTION_SHUTDOWN, action);
-
 }
 
 /* ------------------------------------------------------------------------

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIconfigure.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIconfigure.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIconfigure.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIconfigure.cc Wed Apr 28 13:54:17 2010
@@ -128,7 +128,7 @@ const
 const
   CLI_globals::VarNameDesc
   CLI_configure::conf_protocols_desctable[NUM_CONF_PROTOCOLS_DESCS] = {
-  // HTTP - 14
+  // HTTP - 15
   // ->Keep-alive timeouts - 2
   {"proxy.config.http.keep_alive_no_activity_timeout_in", NULL,
    "Keep-Alive Timeout: Inbound (secs)", "%*d) %-*s %*s\n",
@@ -150,7 +150,7 @@ const
   {"proxy.config.http.transaction_active_timeout_out", NULL,
    "Activity Timeout: Outbound (secs)", "%*d) %-*s %*s\n",
    10, 10, 50, 3},
-  // -> Remove headers - 5
+  // -> Remove headers - 6
   {"proxy.config.http.anonymize_remove_from", NULL,
    "From(1=Yes,0=No)", "%*d) %-*s %*s\n",
    10, 10, 50, 3},
@@ -190,88 +190,6 @@ const
   {"proxy.config.http.ftp.anonymous_passwd", NULL,
    "Anonymous FTP password", "%*d) %-*s %*s\n",
    10, 10, 50, 3},
-// NNTP - 23
-// NNTP - 2/4
-  {"proxy.config.nntp.enabled", NULL,
-   "NNTP Server enabled(1=On,0=Off)", "%*d) %-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.config.nntp.server_port", NULL,
-   "NNTP Server Port:", "%*d) %-*s %*s\n",
-   10, 10, 50, 3},
-// NNTP Options - 11
-  {"proxy.config.nntp.posting_enabled", NULL,
-   "Posting enabled(1=On,0=Off)", "%*d) %-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.config.nntp.access_control_enabled", NULL,
-   "Access Control enabled(1=On,0=Off)", "%*d) %-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.config.nntp.v2_authentication", NULL,
-   "NNTP V2 Authentication enabled(1=On,0=Off)", "%*d) %-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.config.nntp.run_local_authentication_server", NULL,
-   "Run Local Authentication Server (1=Yes,0=No)", "%*d) %-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.config.nntp.cluster_enabled", NULL,
-   "Clustering enabled(1=On,0=Off)", "%*d) %-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.config.nntp.feed_enabled", NULL,
-   "Feed enabled(1=On,0=Off)", "%*d) %-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.config.nntp.logging_enabled", NULL,
-   "Logging enabled(1=On,0=Off)", "%*d) %-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.config.nntp.background_posting_enabled", NULL,
-   "Background Posting enabled(1=On,0=Off)", "%*d) %-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.config.nntp.obey_control_cancel", NULL,
-   "Obey Cancel Control Messages (1=On,0=Off)", "%*d) %-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.config.nntp.obey_control_newgroup", NULL,
-   "Obey NewGroups Control Messages (1=On,0=Off)", "%*d) %-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.config.nntp.obey_control_rmgroup", NULL,
-   "Obey RmGroups Control Messages (1=On,0=Off)", "%*d) %-*s %*s\n",
-   10, 10, 50, 3},
-  // - 10
-  {"proxy.config.nntp.inactivity_timeout", NULL,
-   "Inactivity Timeout(secs):", "%*d) %-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.config.nntp.check_newgroups_every", NULL,
-   "Check for New Groups Every(secs):", "%*d) %-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.config.nntp.check_cancels_every", NULL,
-   "Check for Cancelled Articles Every(secs):", "%*d) %-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.config.nntp.group_check_parent_every", NULL,
-   "Check Parent NNTP Server Every(secs):", "%*d) %-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.config.nntp.group_check_cluster_every", NULL,
-   "Check Cluster Every(secs):", "%*d) %-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.config.nntp.check_pull_every", NULL,
-   "Check Pull Groups Every(secs):", "%*d) %-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.config.nntp.authorization_hostname", NULL,
-   "Authorization Server Host", "%*d) %-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.config.nntp.authorization_port", NULL,
-   "Authorization Server Port", "%*d) %-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.config.nntp.authorization_server_timeout", NULL,
-   "Authorization Server Timeout(mill-secs):", "%*d) %-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.config.nntp.client_speed_throttle", NULL,
-   "Client Speed Throttle(bytes/secs):", "%*d) %-*s %*s\n",
-   10, 10, 50, 3}
-/*
-// RNI - 2
-{"proxy.config.rni.enabled", NULL,
- "Real Networks Enabled(1=On,0=Off)",  "%*d) %-*s %*s\n",
-   10,10,50,3  },
-{"proxy.config.rni.client_port", NULL,
- "Real Networks client port",  "%*d) %-*s %*s\n",
-   10,10,50,3  }
-*/
 };
 
 
@@ -288,9 +206,6 @@ const
   {"proxy.config.http.cache.ftp", NULL,
    "Enable FTP caching(1=On,0=Off)", "%*d) %-*s %*s\n",
    15, 15, 50, 3},
-  {"proxy.config.nntp.cache_enabled", NULL,
-   "Enable NNTP caching(1=On,0=Off)", "%*d) %-*s %*s\n",
-   15, 15, 50, 3},
   {"proxy.config.http.cache.ignore_client_no_cache", NULL,
    "Ignore user requests to bypass cache(1=On,0=Off)", "%*d) %-*s %*s\n",
    15, 15, 50, 3},
@@ -548,9 +463,6 @@ const
    "Auto-delete rolled log files when space is low", "%*d) %-*s %*s\n",
    10, 10, 50, 3},
   // Log Splitting - 2
-  {"proxy.config.log2.separate_nntp_logs", NULL,
-   "NNTP Log Splitting", "%*d) %-*s %*s\n",
-   10, 10, 50, 3},
   {"proxy.config.log2.separate_host_logs", NULL,
    "Host Log Splitting", "%*d) %-*s %*s\n",
    10, 10, 50, 3}
@@ -774,39 +686,25 @@ CLI_configure::doConfigureProtocols(CLI_
   const char *line8 = "    1=PASV/PORT (use PORT if PASV fails)  \n"
     "    2=PASV only (initiate data connection)   \n" "    3=PORT only (receive data connection)\n\n";
   const char *line9 = "\n                            HTTPS \n";
-  const char *line10 = "                            NNTP \n";
-  const char *line11 = "\n     OPTIONS: \n";
-  const char *line12 = "     Inactivity timeout sets how long idle connections remain \n"
-    "     open. A 10 minute minimum is recommended.\n\n";
-  const char *line13 = "     The lists of groups on parent NNTP servers are checked \n"
-    "     periodically for new groups.  They need to be checked \n" "     frequently as the list changes slowly.\n\n";
-  const char *line14 = "     If the Traffic Server is not set to obey cancel control \n"
-    "     messages, it can actively poll groups to detect cancelled \n"
-    "     articles.  This should not be done too frequently as it \n"
-    "     involves communication with the partent NNTP server.\n\n";
-  const char *line15 = "     Poll the parent NNTP Server to see if new articles have \n"
-    "     appeared this often.\n\n";
-  const char *line16 = "     Poll the other Traffic Servers in the cluster see if new \n"
-    "     articles have appeared this often.\n\n";
-  const char *line17 = "     Pull groups are specified in the nntp_servers.config file.\n\n";
-  const char *line18 = "     The Authorization Server will abort an authorization \n"
-    "     operation if it does not complete in this amount of time.\n" "     The client can retry the operation.\n\n";
-  const char *line19 = "     Clients are limited to downloading no more than this number\n"
-    "     of bytes/second. A throttle of 0 means downloading is not\n" "     limited.\n\n";
-  const char *line20 = "     The Authentication Server can be run on either the local \n"
-    "     host or on a remote host. Enter the hostname on which the  \n" "     Authentication Server will run.\n\n";
-  const char *line21 = "     The locally run Authentication Server will accept connections\n"
-    "     on this port, and the Traffic Server will connect to the \n"
-    "     the Authentication Server on this port.\n\n";
+  //  const char *line11 = "\n     OPTIONS: \n";
+  //  const char *line12 = "     Inactivity timeout sets how long idle connections remain \n"
+  //  "     open. A 10 minute minimum is recommended.\n\n";
+  //  const char *line16 = "     Poll the other Traffic Servers in the cluster see if new \n"
+  //  "     articles have appeared this often.\n\n";
+  // const char *line18 = "     The Authorization Server will abort an authorization \n"
+  //  "     operation if it does not complete in this amount of time.\n" "     The client can retry the operation.\n\n";
+  // const char *line19 = "     Clients are limited to downloading no more than this number\n"
+  //  "     of bytes/second. A throttle of 0 means downloading is not\n" "     limited.\n\n";
+  // const char *line20 = "     The Authentication Server can be run on either the local \n"
+  //  "     host or on a remote host. Enter the hostname on which the  \n" "     Authentication Server will run.\n\n";
+  // const char *line21 = "     The locally run Authentication Server will accept connections\n"
+  //  "     on this port, and the Traffic Server will connect to the \n"
+  //  "     the Authentication Server on this port.\n\n";
   const char *line22 = "\n     Traffic Server can insert Client-ip headers to retain the \n"
     "     user's IP address through proxies. \n\n";
-  const char *line23 = "                         Real Networks \n\n";
+  // const char *line23 = "                         Real Networks \n\n";
   int highmark = 0;
   int i;
-  bool ret_value = false;
-
-  // Avoid warnings. /leif
-  NOWARN_UNUSED(line23);
 
   Debug("cli_configure", "Entering doConfigureProtocols, c_data->cevent=%d\n", c_data->cevent);
 
@@ -870,50 +768,6 @@ CLI_configure::doConfigureProtocols(CLI_
     }
     c_data->output->copyFrom("\n", strlen("\n"));
   }
-  // Output NNTP header
-  highmark += NUM_CONF_PROTOCOLS_NNTP_DESCS;
-  if (CL_EV_ONE == c_data->cevent || CL_EV_FOUR == c_data->cevent) {
-    c_data->output->copyFrom(CLI_globals::sep1, strlen(CLI_globals::sep1));
-    c_data->output->copyFrom(line10, strlen(line10));
-
-    // now we need to get all the configuration variables
-    for (i = highmark - NUM_CONF_PROTOCOLS_NNTP_DESCS; i < highmark; i++) {
-      if (i == (2 + highmark - NUM_CONF_PROTOCOLS_NNTP_DESCS)) {
-        c_data->output->copyFrom(line11, strlen(line11));
-      }
-
-      if ((ret_value = varStrFromName(conf_protocols_desctable[i].name, buf, sizeof(buf))) == true) {
-        snprintf(tmpbuf, sizeof(tmpbuf), conf_protocols_desctable[i].format,
-                 conf_protocols_desctable[i].no_width, i,
-                 conf_protocols_desctable[i].desc_width, conf_protocols_desctable[i].desc,
-                 conf_protocols_desctable[i].name_value_width, buf);
-        c_data->output->copyFrom(tmpbuf, strlen(tmpbuf));
-      }
-      if (i == (13 + highmark - NUM_CONF_PROTOCOLS_NNTP_DESCS) && ret_value) {
-        c_data->output->copyFrom(line12, strlen(line12));
-      } else if (i == (14 + highmark - NUM_CONF_PROTOCOLS_NNTP_DESCS) && ret_value) {
-        c_data->output->copyFrom(line13, strlen(line13));
-      } else if (i == (15 + highmark - NUM_CONF_PROTOCOLS_NNTP_DESCS) && ret_value) {
-        c_data->output->copyFrom(line14, strlen(line14));
-      } else if (i == (16 + highmark - NUM_CONF_PROTOCOLS_NNTP_DESCS) && ret_value) {
-        c_data->output->copyFrom(line15, strlen(line15));
-      } else if (i == (17 + highmark - NUM_CONF_PROTOCOLS_NNTP_DESCS) && ret_value) {
-        c_data->output->copyFrom(line16, strlen(line16));
-      } else if (i == (18 + highmark - NUM_CONF_PROTOCOLS_NNTP_DESCS) && ret_value) {
-        c_data->output->copyFrom(line17, strlen(line17));
-      } else if (i == (19 + highmark - NUM_CONF_PROTOCOLS_NNTP_DESCS) && ret_value) {
-        c_data->output->copyFrom(line20, strlen(line20));
-      } else if (i == (20 + highmark - NUM_CONF_PROTOCOLS_NNTP_DESCS) && ret_value) {
-        c_data->output->copyFrom(line21, strlen(line21));
-      } else if (i == (21 + highmark - NUM_CONF_PROTOCOLS_NNTP_DESCS) && ret_value) {
-        c_data->output->copyFrom(line18, strlen(line18));
-      } else if (i == (22 + highmark - NUM_CONF_PROTOCOLS_NNTP_DESCS) && ret_value) {
-        c_data->output->copyFrom(line19, strlen(line19));
-      }
-
-    }
-    c_data->output->copyFrom("\n", strlen("\n"));
-  }
 
   /* Removing RNI stuff for now.  These two variables have been
      either dropped or renamed.  Eventually, this section needs
@@ -961,17 +815,6 @@ CLI_configure::doConfigureCache(CLI_DATA
   const char *line5 = "                              FRESHNESS\n";
   const char *line6 = "                           VARIABLE CONTENT\n";
   const char *line7 = "     Do not cache objects served in response :\n";
-  // Doesn't seem to be used.
-  const char *line8 = "     Do not serve cached objects whose header fields:\n";
-  const char *line9 = "                          HTTP HEADER FIELDS\n";
-  const char *line10 = "     Match These header fields: \n";
-  const char *line11 = "\n     Changing the following value requires database reconfiguration \n\n";
-  const char *line12 = "\n     The Traffic Server caches alternate versions of objects \n"
-    "     (for example, a variety of spoken languages, or formats \n"
-    "     that match different browsers).  This can improve your \n"
-    "     cache performance, but consumes more space.\n\n";
-  const char *line13 = "\n     Setting the low water mark to greater than or equal to \n"
-    "     the high water mark causes the garbage collector to run \n" "     continuously.\n\n";
   const char *line14 = "\n     Before the Traffic Server serves an object from its cache,\n"
     "     it can ask the original content server to verify the object's \n" "     freshness.\n\n";
   const char *line15 = "\n     Some web servers do not stamp the objects they serve with an\n"
@@ -979,10 +822,6 @@ CLI_configure::doConfigureCache(CLI_DATA
     "     considers these cacheable and limit how long these objects are \n" "     considered fresh.\n\n";
   const char *line16 = "\n     If an object has no expiration date, leave it in the cache \n"
     "     for at least 6) but no more than 7).\n";
-  // Doesn't seem to be used.
-  const char *line17 = "\n     Minimum freshness information for a document to be cacheable:\n";
-  const char *line18 = "     0=optimize latency \n"
-    "     1=balance latency and bandwidth \n" "     2=optimize bandwidth \n";
   const char *line19 = "     0=when the object has expired \n"
     "     1=when the object has expired, or has no expiration date\n" "     2=always \n" "     3=never \n";
   const char *line20 = "     0=nothing \n" "     1=a last-modified time \n" "     2=an explict lifetime \n";
@@ -991,16 +830,6 @@ CLI_configure::doConfigureCache(CLI_DATA
   int highmark = 0;
   int i;
 
-  // Avoid warnings on unused text strings. /leif
-  NOWARN_UNUSED(line8);
-  NOWARN_UNUSED(line9);
-  NOWARN_UNUSED(line10);
-  NOWARN_UNUSED(line11);
-  NOWARN_UNUSED(line12);
-  NOWARN_UNUSED(line13);
-  NOWARN_UNUSED(line17);
-  NOWARN_UNUSED(line18);
-
   Debug("cli_configure", "Entering doConfigureCache, c_data->cevent=%d\n", c_data->cevent);
 
   //  set response header

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIconfigure.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIconfigure.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIconfigure.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIconfigure.h Wed Apr 28 13:54:17 2010
@@ -52,12 +52,10 @@ struct CLI_configure
   static const CLI_globals::VarNameDesc conf_server_desctable[NUM_SERVER_DESCS];
 
   /* Protocol Configuration */
-#define NUM_CONF_PROTOCOLS_HTTP_DESCS      14
+#define NUM_CONF_PROTOCOLS_HTTP_DESCS      15
 #define NUM_CONF_PROTOCOLS_FTP_DESCS        3
-#define NUM_CONF_PROTOCOLS_NNTP_DESCS      23
-//#define NUM_CONF_PROTOCOLS_RNI_DESCS        2
   /*------------------------------------------*/
-#define NUM_CONF_PROTOCOLS_DESCS           41
+#define NUM_CONF_PROTOCOLS_DESCS           18
   static const CLI_globals::VarNameDesc conf_protocols_desctable[NUM_CONF_PROTOCOLS_DESCS];
 
   /* Cache Configuration */

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIeventHandler.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIeventHandler.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIeventHandler.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIeventHandler.cc Wed Apr 28 13:54:17 2010
@@ -569,7 +569,7 @@ CmdLine_EventHandler::MonitorProtocolsLe
     /* Fall through */
   case CL_EV_FOUR:             // ICP
     /* Fall through */
-  case CL_EV_FIVE:             // NNTP
+  case CL_EV_FIVE:
     /* Fall through */
   case CL_EV_SIX:              // FIXME: RNI stats section
     Debug("cli_event", "MonitorProtocolsLevel: entered %d case \n", cli_data->cevent);
@@ -910,10 +910,8 @@ CmdLine_EventHandler::ConfigureProtocols
     /* Fall through */
   case CL_EV_THREE:            // show FTP configuration
     /* Fall through */
-  case CL_EV_FOUR:             // show NNTP configuration
-    Debug("cli_event", "ConfigureProtocolsLevel: entered %d case \n", cli_data->cevent);
-    CLI_configure::doConfigureProtocols(cli_data);
-    break;
+  case CL_EV_FOUR:
+    /* Fall through */
   case CL_EV_FIVE:
     /* Fall through */
   case CL_EV_SIX:

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIhelp.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIhelp.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIhelp.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIhelp.cc Wed Apr 28 13:54:17 2010
@@ -108,13 +108,12 @@ static const char *MonNodeHelpStrings[nu
 };
 
 // Help usage at cli->monitor->protocols level
-const int numCmdMonProtocols = 10;
+const int numCmdMonProtocols = 8;
 static const char *MonProtHelpStrings[numCmdMonProtocols] = {
   "1. stats              # displays all the protocol statistics \n",
   "2. http               # displays the HTTP protocol statistics \n",
   "3. ftp                # displays the FTP protocol statistics \n",
   "4. icp                # displays the ICP protocol statistics \n",
-  "5. nntp               # displays the NNTP protocol statistics \n",
   "     Select above options by number \n",
   ".                     # Move back to previous level \n",
   "help                  # displays a list of commands\n",
@@ -193,12 +192,11 @@ static const char *ConfigureServerHelpSt
 };
 
 // Help usage at cli->configure->protocols level
-const int numCmdConfProtocols = 9;
+const int numCmdConfProtocols = 8;
 static const char *ConfigureProtHelpStrings[numCmdConfProtocols] = {
   "1. display            # displays all configuration variables \n",
   "2. http               # HTTP configuration variables \n",
   "3. ftp                # FTP configuration variables \n",
-  "4. nntp               # NNTP configuration variables \n",
   "     Select above options by number \n",
   "change <no> <value>   # sets variable shown by <no> to <value>\n",
   ".                     # Move back to previous level \n",
@@ -311,10 +309,10 @@ CLI_globals::Help(textBuffer * output,  
   // create appropriate Help response
   // 
   // See 'MgmtFeat.cc'
-  // advui == 1(10) -> Advanced UI only           (Regular TS HTTP/FTP/NNTP)
+  // advui == 1(10) -> Advanced UI only           (Regular TS HTTP/FTP)
   //       == 0(00) -> Simple UI only             (on hold....)
   //       == 2(01) -> RNI UI only                (TS for Real Networks, only does RNI caching)
-  //       == 3(11) -> Advanced UI + RNI features (TS w/ RN support HTTP/FTP/NNTP/RNI )
+  //       == 3(11) -> Advanced UI + RNI features (TS w/ RN support HTTP/FTP/RNI )
   // Currently only used to implement cheesy licensing
   // featset == 1 -> indicates that Advanced UI is enabled 
   //         == 0 -> indicates that Advanced UI is disabled

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLImonitor.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLImonitor.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLImonitor.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLImonitor.cc Wed Apr 28 13:54:17 2010
@@ -149,58 +149,6 @@ const
   {"proxy.process.icp.query_response_write\\c", NULL,
    "Sucessful Response Messges Sent to Peers", "%-*s %*s\n",
    10, 10, 50, 3},
-// NNTP - 16 pairs
-  // Client - 3
-  {"proxy.process.nntp.client_connections_currently_open\\c", NULL,
-   "Open Connections", "%-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.process.nntp.client_bytes_read\\b", NULL,
-   "Bytes Read", "%-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.process.nntp.client_bytes_written\\b", NULL,
-   "Bytes Written", "%-*s %*s\n",
-   10, 10, 50, 3},
-  // Server - 3
-  {"proxy.process.nntp.server_connections_currently_open\\c", NULL,
-   "Open Connections", "%-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.process.nntp.server_bytes_read\\b", NULL,
-   "Bytes Read", "%-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.process.nntp.server_bytes_written\\b", NULL,
-   "Bytes Written", "%-*s %*s\n",
-   10, 10, 50, 3},
-  // Operations - 10
-  {"proxy.process.nntp.article_hits\\c", NULL,
-   "Article Hits", "%-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.process.nntp.article_misses\\c", NULL,
-   "Article Misses", "%-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.process.nntp.overview_hits\\c", NULL,
-   "Overview Hits", "%-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.process.nntp.overview_refreshes\\c", NULL,
-   "Overview Refreshes", "%-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.process.nntp.group_hits\\c", NULL,
-   "Group Hits", "%-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.process.nntp.group_refreshes\\c", NULL,
-   "Group Refreshes", "%-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.process.nntp.posts\\c", NULL,
-   "Posts", "%-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.process.nntp.post_bytes\\b", NULL,
-   "Post Bytes", "%-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.process.nntp.pull_bytes\\b", NULL,
-   "Pull Bytes", "%-*s %*s\n",
-   10, 10, 50, 3},
-  {"proxy.process.nntp.feed_bytes\\b", NULL,
-   "Feed Bytes", "%-*s %*s\n",
-   10, 10, 50, 3},
 // RNI Statitics - 13
   // RNI General - 5
   {"proxy.process.rni.object_count\\c", NULL,
@@ -563,13 +511,11 @@ CLI_monitor::doMonitorProtocolStats(CLI_
   const char *line4 = "                             Server \n";
   const char *line5 = "                              FTP \n";
   const char *line6 = "                              ICP \n";
-  const char *line7 = "                              NNTP \n";
-  // Doesn't seem to be used. /leif
   const char *line10 = "              Transaction Frequency and Speeds \n";
   const char *line11 = "Transaction Type              Frequency        Speed(ms)\n";
   const char *line12 = "                 Queries Originating From This Node \n";
   const char *line13 = "                 Queries Originating From ICP Peers\n";
-  const char *line14 = "                           Operations\n";
+  // const char *line14 = "                           Operations\n";
 #if 0
   const char *line15 = "                             WCCP\n";
   const char *line16 = "                      Router Statistics\n";
@@ -676,28 +622,6 @@ CLI_monitor::doMonitorProtocolStats(CLI_
     }
     c_data->output->copyFrom("\n", strlen("\n"));
   }
-  // output NNTP header
-  highmark += NUM_PROT_NNTP_DESCS;
-  if (CL_EV_ONE == c_data->cevent || CL_EV_FIVE == c_data->cevent) {
-    c_data->output->copyFrom(CLI_globals::sep1, strlen(CLI_globals::sep1));
-    c_data->output->copyFrom(line7, strlen(line7));
-    c_data->output->copyFrom(line3, strlen(line3));
-
-    // output NNTP stats
-    for (i = highmark - NUM_PROT_NNTP_DESCS; i < highmark; i++) {
-      if (varStrFromName(mon_prot_desctable[i].name, buf, sizeof(buf)) == true) {
-        snprintf(tmpbuf, sizeof(tmpbuf), mon_prot_desctable[i].format,
-                 mon_prot_desctable[i].desc_width, mon_prot_desctable[i].desc,
-                 mon_prot_desctable[i].name_value_width, buf);
-        c_data->output->copyFrom(tmpbuf, strlen(tmpbuf));
-      }
-      if ((highmark - NUM_PROT_NNTP_DESCS + 2) == i) {
-        c_data->output->copyFrom(line4, strlen(line4));
-      } else if ((highmark - NUM_PROT_NNTP_DESCS + 5) == i) {
-        c_data->output->copyFrom(line14, strlen(line14));
-      }
-    }
-  }
   // Check if RNI enabled 
   if (3 == c_data->advui || 2 == c_data->advui) {       // yes, so show stats
     highmark += NUM_PROT_RNI_DESCS;

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLImonitor.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLImonitor.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLImonitor.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLImonitor.h Wed Apr 28 13:54:17 2010
@@ -42,10 +42,9 @@ struct CLI_monitor
 #define NUM_PROT_HTTP_OS_DESCS  4
 #define NUM_PROT_FTP_DESCS      5
 #define NUM_PROT_ICP_DESCS     11
-#define NUM_PROT_NNTP_DESCS    16
 #define NUM_PROT_RNI_DESCS     13
   /*-------------------------------*/
-#define NUM_PROT_DESCS         61
+#define NUM_PROT_DESCS         37
   static const CLI_globals::VarNameDesc mon_prot_desctable[NUM_PROT_DESCS];
 
 #define NUM_NODE_CACHE_DESCS    3



Mime
View raw message