You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by am...@apache.org on 2010/11/30 02:43:06 UTC
svn commit: r1040383 [20/38] - in /trafficserver/traffic/branches/wccp: ./
build/ contrib/ contrib/perl/AdminClient/lib/Apache/TS/ example/
example/add-header/ example/app-template/ example/append-transform/
example/basic-auth/ example/blacklist-0/ exa...
Modified: trafficserver/traffic/branches/wccp/proxy/logging/LogObject.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/logging/LogObject.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/logging/LogObject.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/logging/LogObject.cc Tue Nov 30 01:42:55 2010
@@ -70,7 +70,7 @@ LogBufferManager::flush_buffers(LogBuffe
_head = _head % DELAY_DELETE_SIZE;
delcnt++;
}
- Debug("log2-logbuffer", "flushed %d buffers: %lu bytes", delcnt, (unsigned long) total_bytes_flushed);
+ Debug("log-logbuffer", "flushed %d buffers: %lu bytes", delcnt, (unsigned long) total_bytes_flushed);
}
return total_bytes_flushed;
}
@@ -137,15 +137,15 @@ LogObject::LogObject(LogFormat * format,
_setup_rolling(rolling_enabled, rolling_interval_sec, rolling_offset_hr, rolling_size_mb);
m_last_roll_time = LogUtils::timestamp();
- Debug("log2-config", "exiting LogObject constructor, filename=%s this=%p", m_filename, this);
+ Debug("log-config", "exiting LogObject constructor, filename=%s this=%p", m_filename, this);
}
LogObject::~LogObject()
{
- Debug("log2-config", "entering LogObject destructor, this=%p", this);
+ Debug("log-config", "entering LogObject destructor, this=%p", this);
while (m_ref_count > 0) {
- Debug("log2-config", "LogObject refcount = %d, waiting for zero", m_ref_count);
+ Debug("log-config", "LogObject refcount = %d, waiting for zero", m_ref_count);
}
flush_buffers(0, 0, 0);
@@ -320,12 +320,7 @@ LogObject::display(FILE * fd)
{
fprintf(fd, "++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n");
fprintf(fd, "LogObject [%p]: format = %s (%p)\nbasename = %s\n" "flags = %u\n"
-#ifdef __alpha
- // the DEC does not like %llu
- "signature = %lu\n",
-#else
"signature = %llu\n",
-#endif
this, m_format->name(), m_format, m_basename, m_flags, m_signature);
#ifndef TS_MICRO
if (is_collation_client()) {
@@ -407,7 +402,7 @@ LogObject::_checkout_write(size_t * writ
if (result_code == LogBuffer::LB_FULL_NO_WRITERS) {
// there are no writers, move the buffer to the flush list
//
- Debug("log2-logbuffer", "adding buffer %d to flush list after checkout", buffer->get_id());
+ Debug("log-logbuffer", "adding buffer %d to flush list after checkout", buffer->get_id());
m_buffer_manager.add_to_flush_queue(buffer);
ink_mutex_acquire(&Log::flush_mutex);
@@ -459,22 +454,22 @@ LogObject::log(LogAccess * lad, char *te
// likewise, send data to a remote client even if local space is exhausted
// (if there is a remote client, m_logFile will be NULL
if (Log::config->logging_space_exhausted && !writes_to_pipe() && m_logFile) {
- LOG_INCREMENT_DYN_STAT(log2_stat_event_log_access_fail_stat);
+ LOG_INCREMENT_DYN_STAT(log_stat_event_log_access_fail_stat);
return Log::FULL;
}
// this verification must be done here in order to avoid 'dead' LogBuffers
// with none zero 'in usage' counters (see _checkout_write for more details)
if (!lad && !text_entry) {
Note("Call to LogAccess without LAD or text entry; skipping");
- LOG_INCREMENT_DYN_STAT(log2_stat_event_log_access_fail_stat);
+ LOG_INCREMENT_DYN_STAT(log_stat_event_log_access_fail_stat);
return Log::FAIL;
}
RefCounter counter(&m_ref_count); // scope exit will decrement
if (lad && m_filter_list.toss_this_entry(lad)) {
- Debug("log2", "entry filtered, skipping ...");
- LOG_INCREMENT_DYN_STAT(log2_stat_event_log_access_skip_stat);
+ Debug("log", "entry filtered, skipping ...");
+ LOG_INCREMENT_DYN_STAT(log_stat_event_log_access_skip_stat);
return Log::SKIP;
}
@@ -483,7 +478,7 @@ LogObject::log(LogAccess * lad, char *te
// LogFormat object for aggregate formats
if (m_format->m_agg_marshal_space == NULL) {
Note("No temp space to marshal aggregate fields into");
- LOG_INCREMENT_DYN_STAT(log2_stat_event_log_access_fail_stat);
+ LOG_INCREMENT_DYN_STAT(log_stat_event_log_access_fail_stat);
return Log::FAIL;
}
@@ -504,7 +499,7 @@ LogObject::log(LogAccess * lad, char *te
}
if (time_now < m_format->m_interval_next) {
- Debug("log2-agg", "Time now = %d, next agg = %d; not time "
+ Debug("log-agg", "Time now = %d, next agg = %d; not time "
"for aggregate entry", time_now, m_format->m_interval_next);
return Log::LOG_OK;
}
@@ -518,8 +513,8 @@ LogObject::log(LogAccess * lad, char *te
}
if (bytes_needed == 0) {
- Debug("log2-buffer", "Nothing to log, bytes_needed = 0");
- LOG_INCREMENT_DYN_STAT(log2_stat_event_log_access_skip_stat);
+ Debug("log-buffer", "Nothing to log, bytes_needed = 0");
+ LOG_INCREMENT_DYN_STAT(log_stat_event_log_access_skip_stat);
return Log::SKIP;
}
// Now try to place this entry in the current LogBuffer.
@@ -529,7 +524,7 @@ LogObject::log(LogAccess * lad, char *te
if (!buffer) {
Note("Traffic Server is skipping the current log entry for %s because "
"its size (%d) exceeds the maximum payload space in a " "log buffer", m_basename, bytes_needed);
- LOG_INCREMENT_DYN_STAT(log2_stat_event_log_access_fail_stat);
+ LOG_INCREMENT_DYN_STAT(log_stat_event_log_access_fail_stat);
return Log::FAIL;
}
//
@@ -544,7 +539,7 @@ LogObject::log(LogAccess * lad, char *te
bytes_used = m_format->m_field_list.marshal_agg(&(*buffer)[offset]);
ink_assert(bytes_needed >= bytes_used);
m_format->m_interval_next += m_format->m_interval_sec;
- Debug("log2-agg", "Aggregate entry created; next time is %d", m_format->m_interval_next);
+ Debug("log-agg", "Aggregate entry created; next time is %d", m_format->m_interval_next);
} else if (lad) {
bytes_used = m_format->m_field_list.marshal(lad, &(*buffer)[offset]);
ink_assert(bytes_needed >= bytes_used);
@@ -556,7 +551,7 @@ LogObject::log(LogAccess * lad, char *te
if (result_code == LogBuffer::LB_ALL_WRITERS_DONE) {
// all checkins completed, put this buffer in the flush list
- Debug("log2-logbuffer", "adding buffer %d to flush list after checkin", buffer->get_id());
+ Debug("log-logbuffer", "adding buffer %d to flush list after checkin", buffer->get_id());
m_buffer_manager.add_to_flush_queue(buffer);
ink_mutex_acquire(&Log::flush_mutex);
@@ -565,7 +560,7 @@ LogObject::log(LogAccess * lad, char *te
ink_mutex_release(&Log::flush_mutex);
}
- LOG_INCREMENT_DYN_STAT(log2_stat_event_log_access_stat);
+ LOG_INCREMENT_DYN_STAT(log_stat_event_log_access_stat);
return Log::LOG_OK;
}
@@ -895,7 +890,7 @@ LogObjectManager::_manage_object(LogObje
_add_object(log_object);
}
- Debug("log2", "LogObjectManager managing object %s (%s) "
+ Debug("log", "LogObjectManager managing object %s (%s) "
"[signature = %llu, address = %p]",
log_object->get_base_filename(),
col_client ? "collation client" :
@@ -961,7 +956,7 @@ LogObjectManager::_solve_filename_confli
if (got_sig && signature == obj_sig) {
conflicts = false;
}
- Debug("log2", "LogObjectManager::_solve_filename_conflicts\n"
+ Debug("log", "LogObjectManager::_solve_filename_conflicts\n"
"\tfilename = %s\n"
"\tmeta file signature = %llu\n"
"\tlog object signature = %llu\n" "\tconflicts = %d", filename, signature, obj_sig, conflicts);
@@ -1231,15 +1226,15 @@ LogObjectManager::transfer_objects(LogOb
size_t i;
size_t num_kept_objects = 0;
- if (is_debug_tag_set("log2-config-transfer")) {
- Debug("log2-config-transfer", "TRANSFER OBJECTS: list of old objects");
+ if (is_debug_tag_set("log-config-transfer")) {
+ Debug("log-config-transfer", "TRANSFER OBJECTS: list of old objects");
for (i = 0; i < old_mgr._numObjects; i++) {
- Debug("log2-config-transfer", "%s", old_mgr._objects[i]->get_original_filename());
+ Debug("log-config-transfer", "%s", old_mgr._objects[i]->get_original_filename());
}
- Debug("log2-config-transfer", "TRANSFER OBJECTS : list of new objects");
+ Debug("log-config-transfer", "TRANSFER OBJECTS : list of new objects");
for (i = 0; i < _numObjects; i++) {
- Debug("log2-config-transfer", "%s", _objects[i]->get_original_filename());
+ Debug("log-config-transfer", "%s", _objects[i]->get_original_filename());
}
}
@@ -1251,7 +1246,7 @@ LogObjectManager::transfer_objects(LogOb
for (i = 0; i < old_mgr._numObjects; i++) {
old_obj = old_objects[i];
- Debug("log2-config-transfer", "examining existing object %s", old_obj->get_base_filename());
+ Debug("log-config-transfer", "examining existing object %s", old_obj->get_base_filename());
// see if any of the new objects is just a copy of an old one,
// if so, keep the old one and delete the new one
@@ -1262,11 +1257,11 @@ LogObjectManager::transfer_objects(LogOb
for (j = 0; j < _numObjects; j++) {
obj = _objects[j];
- Debug("log2-config-transfer",
+ Debug("log-config-transfer",
"comparing existing object %s to new object %s", old_obj->get_base_filename(), obj->get_base_filename());
if (*obj == *old_obj) {
- Debug("log2-config-transfer", "keeping existing object %s", old_obj->get_base_filename());
+ Debug("log-config-transfer", "keeping existing object %s", old_obj->get_base_filename());
_objects[j] = old_obj;
delete obj;
@@ -1279,14 +1274,14 @@ LogObjectManager::transfer_objects(LogOb
// inactive objects
//
if (j == _numObjects) {
- Debug("log2-config-transfer", "moving existing object %s to inactive list", old_obj->get_base_filename());
+ Debug("log-config-transfer", "moving existing object %s to inactive list", old_obj->get_base_filename());
Log::add_to_inactive(old_obj);
}
}
- if (is_debug_tag_set("log2-config-transfer")) {
- Debug("log2-config-transfer", "Log Object List after transfer:");
+ if (is_debug_tag_set("log-config-transfer")) {
+ Debug("log-config-transfer", "Log Object List after transfer:");
display();
}
}
Modified: trafficserver/traffic/branches/wccp/proxy/logging/LogObject.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/logging/LogObject.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/logging/LogObject.h (original)
+++ trafficserver/traffic/branches/wccp/proxy/logging/LogObject.h Tue Nov 30 01:42:55 2010
@@ -60,11 +60,11 @@
#define ACQUIRE_API_MUTEX(_f) \
ink_mutex_acquire(_APImutex); \
-Debug("log2-api-mutex", _f)
+Debug("log-api-mutex", _f)
#define RELEASE_API_MUTEX(_f) \
ink_mutex_release(_APImutex); \
-Debug("log2-api-mutex", _f)
+Debug("log-api-mutex", _f)
class LogBufferManager
{
Modified: trafficserver/traffic/branches/wccp/proxy/logging/LogSock.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/logging/LogSock.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/logging/LogSock.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/logging/LogSock.cc Tue Nov 30 01:42:55 2010
@@ -63,7 +63,7 @@ m_max_connections(max_connects + 1)
init_cid(i, NULL, 0, -1, LogSock::LS_STATE_UNUSED);
}
- Debug("log2-sock", "LogSocket established");
+ Debug("log-sock", "LogSocket established");
}
/*-------------------------------------------------------------------------
@@ -74,7 +74,7 @@ m_max_connections(max_connects + 1)
LogSock::~LogSock()
{
- Debug("log2-sock", "shutting down LogSocket on [%s:%d]", ct[0].host, ct[0].port);
+ Debug("log-sock", "shutting down LogSocket on [%s:%d]", ct[0].host, ct[0].port);
this->close(); // close all connections
this->close(0); // close accept socket
@@ -100,7 +100,7 @@ LogSock::listen(int accept_port)
int ret;
SOCKET accept_sd;
- Debug("log2-sock", "Listening ...");
+ Debug("log-sock", "Listening ...");
//
// create the socket for accepting new connections
@@ -180,7 +180,7 @@ LogSock::listen(int accept_port)
init_cid(0, this_host, accept_port, accept_sd, LogSock::LS_STATE_INCOMING);
m_accept_connections = true;
- Debug("log2-sock", "LogSocket established on [%s:%d]", this_host, accept_port);
+ Debug("log-sock", "LogSocket established on [%s:%d]", this_host, accept_port);
return 0;
}
@@ -209,7 +209,7 @@ LogSock::accept()
return LogSock::LS_ERROR_CONNECT_TABLE_FULL;
}
- Debug("log2-sock", "waiting to accept a new connection");
+ Debug("log-sock", "waiting to accept a new connection");
connect_sd =::accept(ct[0].sd, (sockaddr *) & connect_addr,
(socklen_t *) & size
@@ -220,7 +220,7 @@ LogSock::accept()
init_cid(cid, NULL, connect_addr.sin_port, connect_sd, LogSock::LS_STATE_INCOMING);
- Debug("log2-sock", "new connection accepted, cid = %d, port = %d", cid, connect_addr.sin_port);
+ Debug("log-sock", "new connection accepted, cid = %d, port = %d", cid, connect_addr.sin_port);
return cid;
}
@@ -258,7 +258,7 @@ LogSock::connect(unsigned host_ip, int p
char ipstr[32];
LogUtils::ip_to_str(host_ip, ipstr, sizeof(ipstr));
- Debug("log2-sock", "connecting to [%s:%d]", ipstr, port);
+ Debug("log-sock", "connecting to [%s:%d]", ipstr, port);
// get an index into the connection table
cid = new_cid();
@@ -296,7 +296,7 @@ LogSock::connect(unsigned host_ip, int p
init_cid(cid, ipstr, port, connect_sd, LogSock::LS_STATE_OUTGOING);
- Debug("log2-sock", "outgoing connection to [%s:%d] established, fd = %d", ipstr, port, cid);
+ Debug("log-sock", "outgoing connection to [%s:%d] established, fd = %d", ipstr, port, cid);
return cid;
}
@@ -369,7 +369,7 @@ bool LogSock::pending_data(int *cid, int
if (ret == 0) {
return false; // timeout
} else if (ret < 0) {
- Debug("log2-sock", "error on poll");
+ Debug("log-sock", "error on poll");
return false; // error
}
//
@@ -381,12 +381,12 @@ bool LogSock::pending_data(int *cid, int
for (i = 0; i < n_poll_fds; i++) {
if (fds[i].revents & POLLIN) {
*cid = fd_to_cid[i];
- Debug("log2-sock", "poll successful on index %d", *cid);
+ Debug("log-sock", "poll successful on index %d", *cid);
return true;
}
}
- Debug("log2-sock", "invalid revents in the poll table");
+ Debug("log-sock", "invalid revents in the poll table");
return false;
}
@@ -462,7 +462,7 @@ LogSock::close(int cid)
{
ink_assert(cid >= 0 && cid < m_max_connections);
- Debug("log2-sock", "closing connection for cid %d", cid);
+ Debug("log-sock", "closing connection for cid %d", cid);
if (ct[cid].state != LogSock::LS_STATE_UNUSED) {
::close(ct[cid].sd);
@@ -504,12 +504,12 @@ LogSock::write(int cid, void *buf, int b
return LogSock::LS_ERROR_STATE;
}
- Debug("log2-sock", "Sending %d bytes to cid %d", bytes, cid);
+ Debug("log-sock", "Sending %d bytes to cid %d", bytes, cid);
//
// send the message header
//
- Debug("log2-sock", " sending header (%d bytes)", sizeof(LogSock::MsgHeader));
+ Debug("log-sock", " sending header (%d bytes)", sizeof(LogSock::MsgHeader));
header.msg_bytes = htonl(bytes);
ret =::send(ct[cid].sd, (char *) &header, sizeof(LogSock::MsgHeader), 0);
if (ret != sizeof(LogSock::MsgHeader)) {
@@ -518,7 +518,7 @@ LogSock::write(int cid, void *buf, int b
//
// send the actual data
//
- Debug("log2-sock", " sending data (%d bytes)", bytes);
+ Debug("log-sock", " sending data (%d bytes)", bytes);
return::send(ct[cid].sd, (char *) buf, bytes, 0);
}
@@ -543,7 +543,7 @@ LogSock::read(int cid, void *buf, unsign
return LogSock::LS_ERROR_STATE;
}
- Debug("log2-sock", "reading data from cid %d", cid);
+ Debug("log-sock", "reading data from cid %d", cid);
if (read_header(ct[cid].sd, &header) < 0) {
return LogSock::LS_ERROR_READ;
@@ -574,7 +574,7 @@ LogSock::read_alloc(int cid, int *size)
return NULL;
}
- Debug("log2-sock", "reading data from cid %d", cid);
+ Debug("log-sock", "reading data from cid %d", cid);
if (read_header(ct[cid].sd, &header) < 0) {
return NULL;
@@ -631,7 +631,7 @@ LogSock::check_connections()
for (int i = 1; i < m_max_connections; i++) {
if (ct[i].state == LogSock::LS_STATE_INCOMING) {
if (!is_connected(i, true)) {
- Debug("log2-sock", "Connection %d is no longer connected");
+ Debug("log-sock", "Connection %d is no longer connected");
close(i);
}
}
Modified: trafficserver/traffic/branches/wccp/proxy/logging/LogStandalone.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/logging/LogStandalone.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/logging/LogStandalone.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/logging/LogStandalone.cc Tue Nov 30 01:42:55 2010
@@ -46,7 +46,6 @@
#define HttpBodyFactory int
// globals the rest of the system depends on
-extern int use_accept_thread;
extern int fds_limit;
extern int cluster_port_number;
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/AddConfigFilesHere.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/AddConfigFilesHere.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/AddConfigFilesHere.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/AddConfigFilesHere.cc Tue Nov 30 01:42:55 2010
@@ -66,7 +66,6 @@ initializeRegistry()
// NOTE: Logic that controls which files are not sync'd around the
// cluster is located in ClusterCom::constructSharedFilePacket
- configFiles->addFile("logs.config", false);
configFiles->addFile("log_hosts.config", false);
configFiles->addFile("logs_xml.config", false);
configFiles->addFile("storage.config", false);
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/LocalManager.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/LocalManager.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/LocalManager.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/LocalManager.cc Tue Nov 30 01:42:55 2010
@@ -44,7 +44,7 @@
#include <sys/capability.h>
#endif
-int bindProxyPort(int, in_addr_t, bool, int);
+int bindProxyPort(int, char*, int, bool, int);
bool
LocalManager::SetForDup(void *hIOCPort, long lTProcId, void *hTh)
@@ -326,9 +326,9 @@ BaseManager(), run_proxy(proxy_on), reco
// Bind proxy ports to incoming_ip_to_bind
char *incoming_ip_to_bind_str = REC_readString("proxy.local.incoming_ip_to_bind", &found);
if (found && incoming_ip_to_bind_str != NULL) {
- proxy_server_incoming_ip_to_bind = inet_addr(incoming_ip_to_bind_str);
+ proxy_server_incoming_ip_to_bind_str = incoming_ip_to_bind_str;
} else {
- proxy_server_incoming_ip_to_bind = htonl(INADDR_ANY);
+ proxy_server_incoming_ip_to_bind_str = NULL;
}
config_path = REC_readString("proxy.config.config_dir", &found);
char *absolute_config_path = Layout::get()->relative(config_path);
@@ -1205,20 +1205,32 @@ LocalManager::listenForProxy()
if (proxy_server_port[i] != -1) {
if (proxy_server_fd[i] < 0) {
- bool transparent = false;
+ int domain = AF_INET;
+ int type = SOCK_STREAM;
+ bool transparent = false;
switch (*proxy_server_port_attributes[i]) {
case 'D':
// D is for DNS proxy, udp only
- proxy_server_fd[i] = bindProxyPort(proxy_server_port[i], proxy_server_incoming_ip_to_bind, transparent, SOCK_DGRAM);
+ type = SOCK_DGRAM;
+ break;
+ case '>': // in-bound (client side) transparent
+ case '=': // fully transparent
+ transparent = true;
+ break;
+ default:
+ type = SOCK_STREAM;
+ }
+
+ switch (*(proxy_server_port_attributes[i] + 1)) {
+ case '6':
+ domain = AF_INET6;
break;
- case '>': // in-bound (client side) transparent
- case '=': // fully transparent
- transparent = true;
- // *FALLTHROUGH*
default:
- proxy_server_fd[i] = bindProxyPort(proxy_server_port[i], proxy_server_incoming_ip_to_bind, transparent, SOCK_STREAM);
+ domain = AF_INET;
}
+
+ proxy_server_fd[i] = bindProxyPort(proxy_server_port[i], proxy_server_incoming_ip_to_bind_str, domain, transparent, type);
}
if (*proxy_server_port_attributes[i] != 'D') {
@@ -1307,11 +1319,14 @@ restoreRootPriv(uid_t *old_euid)
* Also, type specifies udp or tcp
*/
int
-bindProxyPort(int proxy_port, in_addr_t incoming_ip_to_bind, bool transparent, int type)
+bindProxyPort(int proxy_port, char *incoming_ip_to_bind_str, int domain, bool transparent, int type)
{
int one = 1;
- struct sockaddr_in proxy_addr;
int proxy_port_fd = -1;
+ struct addrinfo hints;
+ struct addrinfo *result = NULL;
+ char proxy_port_str[8] = {'\0'};
+ int err = 0;
#if !TS_USE_POSIX_CAP
bool privBoost = false;
@@ -1330,10 +1345,15 @@ bindProxyPort(int proxy_port, in_addr_t
#endif
/* Setup reliable connection, for large config changes */
- if ((proxy_port_fd = socket(AF_INET, type, 0)) < 0) {
+ if ((proxy_port_fd = socket(domain, type, 0)) < 0) {
mgmt_elog(stderr, "[bindProxyPort] Unable to create socket : %s\n", strerror(errno));
_exit(1);
}
+ if (domain == AF_INET6) {
+ if (setsockopt(proxy_port_fd, IPPROTO_IPV6, IPV6_V6ONLY, ON, sizeof(int)) < 0) {
+ mgmt_elog(stderr, "[bindProxyPort] Unable to set socket options: %d : %s\n", proxy_port, strerror(errno));
+ }
+ }
if (setsockopt(proxy_port_fd, SOL_SOCKET, SO_REUSEADDR, (char *) &one, sizeof(int)) < 0) {
mgmt_elog(stderr, "[bindProxyPort] Unable to set socket options: %d : %s\n", proxy_port, strerror(errno));
_exit(1);
@@ -1352,16 +1372,25 @@ bindProxyPort(int proxy_port, in_addr_t
#endif
}
- memset(&proxy_addr, 0, sizeof(proxy_addr));
- proxy_addr.sin_family = AF_INET;
- proxy_addr.sin_addr.s_addr = incoming_ip_to_bind;
- proxy_addr.sin_port = htons(proxy_port);
+ snprintf(proxy_port_str, sizeof(proxy_port_str), "%d", proxy_port);
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = domain;
+ hints.ai_socktype = type;
+ hints.ai_flags = AI_PASSIVE;
+
+ err = getaddrinfo(incoming_ip_to_bind_str, proxy_port_str, &hints, &result);
+ if (err != 0) {
+ mgmt_elog(stderr, "[bindProxyPort] Unable to get address info: %s : %s\n", incoming_ip_to_bind_str, gai_strerror(err));
+ _exit(1);
+ }
- if ((bind(proxy_port_fd, (struct sockaddr *) &proxy_addr, sizeof(proxy_addr))) < 0) {
+ if((bind(proxy_port_fd, result->ai_addr, result->ai_addrlen)) < 0) {
mgmt_elog(stderr, "[bindProxyPort] Unable to bind socket: %d : %s\n", proxy_port, strerror(errno));
_exit(1);
}
+ freeaddrinfo(result);
+
Debug("lm", "[bindProxyPort] Successfully bound proxy port %d\n", proxy_port);
#if !TS_USE_POSIX_CAP
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/LocalManager.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/LocalManager.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/LocalManager.h (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/LocalManager.h Tue Nov 30 01:42:55 2010
@@ -129,10 +129,6 @@ public:
void syslogThrInit();
volatile bool run_proxy;
-#ifdef __alpha
- static bool clean_up;
-#endif
-
volatile time_t manager_started_at;
volatile time_t proxy_started_at;
volatile int proxy_launch_count;
@@ -143,6 +139,7 @@ public:
volatile char proxy_server_port_attributes[MAX_PROXY_SERVER_PORTS][MAX_ATTR_LEN];
volatile int proxy_server_fd[MAX_PROXY_SERVER_PORTS];
in_addr_t proxy_server_incoming_ip_to_bind;
+ char *proxy_server_incoming_ip_to_bind_str;
int process_server_timeout_secs;
int process_server_timeout_msecs;
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/Main.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/Main.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/Main.cc Tue Nov 30 01:42:55 2010
@@ -346,13 +346,13 @@ init_dirs(bool use_librecords = true)
if (access(system_log_dir, W_OK) == -1) {
if (use_librecords) {
- REC_ReadConfigString(buf, "proxy.config.log2.logfile_dir", PATH_NAME_MAX);
+ REC_ReadConfigString(buf, "proxy.config.log.logfile_dir", PATH_NAME_MAX);
Layout::get()->relative(system_log_dir, PATH_NAME_MAX, buf);
}
if (access(system_log_dir, W_OK) == -1) {
mgmt_elog("unable to access() log dir'%s': %d, %s\n",
system_log_dir, errno, strerror(errno));
- mgmt_elog("please set 'proxy.config.log2.logfile_dir'\n");
+ mgmt_elog("please set 'proxy.config.log.logfile_dir'\n");
_exit(1);
}
}
@@ -1150,9 +1150,6 @@ SignalHandler(int sig)
if (lmgmt && !clean) {
clean = 1;
-#ifdef __alpha
- lmgmt->clean_up = true;
-#endif
if (lmgmt->watched_process_pid != -1) {
if (sig == SIGTERM || sig == SIGINT) {
@@ -1262,16 +1259,12 @@ printUsage()
void
fileUpdated(char *fname)
{
-
if (strcmp(fname, "cluster.config") == 0) {
lmgmt->signalFileChange("proxy.config.cluster.cluster_configuration");
} else if (strcmp(fname, "remap.config") == 0) {
lmgmt->signalFileChange("proxy.config.url_remap.filename");
- } else if (strcmp(fname, "logs.config") == 0) {
- lmgmt->signalFileChange("proxy.config.log2.config_file");
-
} else if (strcmp(fname, "socks.config") == 0) {
lmgmt->signalFileChange("proxy.config.socks.socks_config_file");
@@ -1335,10 +1328,10 @@ fileUpdated(char *fname)
mgmt_log(stderr, "[fileUpdated] mgr.cnf file has been modified\n");
} else if (strcmp(fname, "log_hosts.config") == 0) {
- lmgmt->signalFileChange("proxy.config.log2.hosts_config_file");
+ lmgmt->signalFileChange("proxy.config.log.hosts_config_file");
} else if (strcmp(fname, "logs_xml.config") == 0) {
- lmgmt->signalFileChange("proxy.config.log2.xml_config_file");
+ lmgmt->signalFileChange("proxy.config.log.xml_config_file");
} else if (strcmp(fname, "splitdns.config") == 0) {
mgmt_log(stderr, "[fileUpdated] splitdns.config file has been modified\n");
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/RecordsConfig.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/RecordsConfig.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/RecordsConfig.cc Tue Nov 30 01:42:55 2010
@@ -129,9 +129,6 @@ RecordElement RecordsConfig[] = {
// The maximum number of chunks to allocate with mmap. Setting this to zero disables all use of mmap. (Unix only)
{CONFIG, "proxy.config.system.mmap_max", "", INK_INT, "1073741823", RU_RESTART_TS, RR_NULL, RC_INT, NULL, RA_READ_ONLY}
,
- // Enable/disable memalign preallocation memory
- {CONFIG, "proxy.config.system.memalign_heap", "", INK_INT, "0", RU_NULL, RR_NULL, RC_INT, NULL, RA_READ_ONLY}
- ,
// Traffic Server Execution threads configuration
// By default Traffic Server set number of execution threads equal to total CPUs
{CONFIG, "proxy.config.exec_thread.autoconfig", "", INK_INT, "1", RU_RESTART_TS, RR_NULL, RC_INT, "[0-65535]",
@@ -816,9 +813,6 @@ RecordElement RecordsConfig[] = {
,
{CONFIG, "proxy.config.http.connect_attempts_timeout", "", INK_INT, "30", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.http.streaming_connect_attempts_timeout", "", INK_INT, "1800", RU_REREAD, RR_NULL, RC_NULL,
- NULL, RA_NULL}
- ,
{CONFIG, "proxy.config.http.post_connect_attempts_timeout", "", INK_INT, "1800", RU_REREAD, RR_NULL, RC_NULL, NULL,
RA_NULL}
,
@@ -1915,7 +1909,7 @@ RecordElement RecordsConfig[] = {
,
{CONFIG, "proxy.config.cache.max_agg_delay", "", INK_INT, "1000", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.cache.threads_per_disk", "", INK_INT, "4", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.cache.threads_per_disk", "", INK_INT, "8", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
{CONFIG, "proxy.config.cache.aio_sleep_time", "", INK_INT, "100", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
@@ -2053,6 +2047,8 @@ RecordElement RecordsConfig[] = {
,
{CONFIG, "proxy.config.dns.round_robin_nameservers", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
+ {CONFIG, "proxy.config.dns.dedicated_thread", "", INK_INT, "0", RU_RESTART_TS, RR_NULL, RC_NULL, "[0-1]", RA_NULL}
+ ,
{PROCESS, "proxy.process.dns.total_dns_lookups", "", INK_INT, "0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
,
{PROCESS, "proxy.process.dns.lookup_avg_time", "", INK_FLOAT, "0.00", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
@@ -2140,12 +2136,6 @@ RecordElement RecordsConfig[] = {
//# HTTP
//#
//##########################################################################
- // #######
- // # SSL #
- // #######
- {CONFIG, "proxy.config.http.ssl_ports", "", INK_STRING, "443 563", RU_REREAD, RR_NULL, RC_STR,
- "^[[:digit:][:space:]]+$", RA_NULL}
- ,
//##########################################################################
// ###########
// # CONNECT #
@@ -2176,136 +2166,134 @@ RecordElement RecordsConfig[] = {
//# 0: no logging at all
//# 1: log errors only
//# 2: full logging
- {CONFIG, "proxy.config.log2.logging_enabled", "", INK_INT, "2", RU_REREAD, RR_NULL, RC_INT, "[0-4]", RA_NULL}
+ {CONFIG, "proxy.config.log.logging_enabled", "", INK_INT, "2", RU_REREAD, RR_NULL, RC_INT, "[0-4]", RA_NULL}
,
- {CONFIG, "proxy.config.log2.log_buffer_size", "", INK_INT, "9216", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.log_buffer_size", "", INK_INT, "9216", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.max_entries_per_buffer", "", INK_INT, "100", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.max_entries_per_buffer", "", INK_INT, "100", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.max_secs_per_buffer", "", INK_INT, "5", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.max_secs_per_buffer", "", INK_INT, "5", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.max_space_mb_for_logs", "", INK_INT, "2000", RU_REREAD, RR_NULL, RC_STR, "^[0-9]+$",
+ {CONFIG, "proxy.config.log.max_space_mb_for_logs", "", INK_INT, "2000", RU_REREAD, RR_NULL, RC_STR, "^[0-9]+$",
RA_NULL}
,
- {CONFIG, "proxy.config.log2.max_space_mb_for_orphan_logs", "", INK_INT, "25", RU_REREAD, RR_NULL, RC_STR, "^[0-9]+$",
+ {CONFIG, "proxy.config.log.max_space_mb_for_orphan_logs", "", INK_INT, "25", RU_REREAD, RR_NULL, RC_STR, "^[0-9]+$",
RA_NULL}
,
- {CONFIG, "proxy.config.log2.max_space_mb_headroom", "", INK_INT, "10", RU_REREAD, RR_NULL, RC_STR, "^[0-9]+$", RA_NULL}
+ {CONFIG, "proxy.config.log.max_space_mb_headroom", "", INK_INT, "10", RU_REREAD, RR_NULL, RC_STR, "^[0-9]+$", RA_NULL}
,
- {CONFIG, "proxy.config.log2.hostname", "", INK_STRING, "localhost", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.hostname", "", INK_STRING, "localhost", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.logfile_dir", "", INK_STRING, "var/log/trafficserver", RU_REREAD, RR_NULL, RC_STR, "^[^[:space:]]+$",
+ {CONFIG, "proxy.config.log.logfile_dir", "", INK_STRING, "var/log/trafficserver", RU_REREAD, RR_NULL, RC_STR, "^[^[:space:]]+$",
RA_NULL}
,
- {CONFIG, "proxy.config.log2.logfile_perm", "", INK_STRING, "rw-r--r--", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
- ,
- {CONFIG, "proxy.config.log2.custom_logs_enabled", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
- ,
- {CONFIG, "proxy.config.log2.xml_logs_config", "", INK_INT, "1", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.logfile_perm", "", INK_STRING, "rw-r--r--", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.config_file", "", INK_STRING, "logs.config", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.custom_logs_enabled", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.xml_config_file", "", INK_STRING, "logs_xml.config", RU_REREAD, RR_NULL, RC_NULL, NULL,
+ {CONFIG, "proxy.config.log.xml_config_file", "", INK_STRING, "logs_xml.config", RU_REREAD, RR_NULL, RC_NULL, NULL,
RA_NULL}
,
- {CONFIG, "proxy.config.log2.hosts_config_file", "", INK_STRING, "log_hosts.config", RU_REREAD, RR_NULL, RC_NULL, NULL,
+ {CONFIG, "proxy.config.log.hosts_config_file", "", INK_STRING, "log_hosts.config", RU_REREAD, RR_NULL, RC_NULL, NULL,
RA_NULL}
,
- {CONFIG, "proxy.config.log2.squid_log_enabled", "", INK_INT, "1", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.squid_log_enabled", "", INK_INT, "1", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.squid_log_is_ascii", "", INK_INT, "1", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.squid_log_is_ascii", "", INK_INT, "1", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.squid_log_name", "", INK_STRING, "squid", RU_REREAD, RR_NULL, RC_STR, "^[^[:space:]]*$",
+ {CONFIG, "proxy.config.log.squid_log_name", "", INK_STRING, "squid", RU_REREAD, RR_NULL, RC_STR, "^[^[:space:]]*$",
RA_NULL}
,
- {CONFIG, "proxy.config.log2.squid_log_header", "", INK_STRING, NULL, RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.squid_log_header", "", INK_STRING, NULL, RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.common_log_enabled", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.common_log_enabled", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.common_log_is_ascii", "", INK_INT, "1", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.common_log_is_ascii", "", INK_INT, "1", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.common_log_name", "", INK_STRING, "common", RU_REREAD, RR_NULL, RC_STR, "^[^[:space:]]*$",
+ {CONFIG, "proxy.config.log.common_log_name", "", INK_STRING, "common", RU_REREAD, RR_NULL, RC_STR, "^[^[:space:]]*$",
RA_NULL}
,
- {CONFIG, "proxy.config.log2.common_log_header", "", INK_STRING, NULL, RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.common_log_header", "", INK_STRING, NULL, RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.extended_log_enabled", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.extended_log_enabled", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.extended_log_is_ascii", "", INK_INT, "1", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.extended_log_is_ascii", "", INK_INT, "1", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.extended_log_name", "", INK_STRING, "extended", RU_REREAD, RR_NULL, RC_STR,
+ {CONFIG, "proxy.config.log.extended_log_name", "", INK_STRING, "extended", RU_REREAD, RR_NULL, RC_STR,
"^[^[:space:]]*$", RA_NULL}
,
- {CONFIG, "proxy.config.log2.extended_log_header", "", INK_STRING, NULL, RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.extended_log_header", "", INK_STRING, NULL, RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.extended2_log_enabled", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.extended2_log_enabled", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.extended2_log_is_ascii", "", INK_INT, "1", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.extended2_log_is_ascii", "", INK_INT, "1", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.extended2_log_name", "", INK_STRING, "extended2", RU_REREAD, RR_NULL, RC_STR,
+ {CONFIG, "proxy.config.log.extended2_log_name", "", INK_STRING, "extended2", RU_REREAD, RR_NULL, RC_STR,
"^[^[:space:]]*$", RA_NULL}
,
- {CONFIG, "proxy.config.log2.extended2_log_header", "", INK_STRING, NULL, RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.extended2_log_header", "", INK_STRING, NULL, RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.separate_icp_logs", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.separate_icp_logs", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.separate_host_logs", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.separate_host_logs", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.collation_host", "", INK_STRING, NULL, RU_REREAD, RR_NULL, RC_STR, "^[^[:space:]]*$",
+ {CONFIG, "proxy.config.log.collation_host", "", INK_STRING, NULL, RU_REREAD, RR_NULL, RC_STR, "^[^[:space:]]*$",
RA_NULL}
,
- {CONFIG, "proxy.config.log2.collation_port", "", INK_INT, "8085", RU_REREAD, RR_REQUIRED, RC_INT,
+ {CONFIG, "proxy.config.log.collation_port", "", INK_INT, "8085", RU_REREAD, RR_REQUIRED, RC_INT,
"[0-65535]", RA_NULL}
,
- {CONFIG, "proxy.config.log2.collation_secret", "", INK_STRING, "foobar", RU_REREAD, RR_NULL, RC_STR, ".*", RA_NULL}
+ {CONFIG, "proxy.config.log.collation_secret", "", INK_STRING, "foobar", RU_REREAD, RR_NULL, RC_STR, ".*", RA_NULL}
,
- {CONFIG, "proxy.config.log2.collation_host_tagged", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_INT, "[0-1]", RA_NULL}
+ {CONFIG, "proxy.config.log.collation_host_tagged", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_INT, "[0-1]", RA_NULL}
,
- {CONFIG, "proxy.config.log2.collation_retry_sec", "", INK_INT, "5", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.collation_retry_sec", "", INK_INT, "5", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.collation_max_send_buffers", "", INK_INT, "16", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.collation_max_send_buffers", "", INK_INT, "16", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.rolling_enabled", "", INK_INT, "1", RU_REREAD, RR_NULL, RC_INT, "[0-4]", RA_NULL}
+ {CONFIG, "proxy.config.log.rolling_enabled", "", INK_INT, "1", RU_REREAD, RR_NULL, RC_INT, "[0-4]", RA_NULL}
,
- {CONFIG, "proxy.config.log2.rolling_interval_sec", "", INK_INT, "86400", RU_REREAD, RR_NULL, RC_STR, "^[0-9]+$",
+ {CONFIG, "proxy.config.log.rolling_interval_sec", "", INK_INT, "86400", RU_REREAD, RR_NULL, RC_STR, "^[0-9]+$",
RA_NULL}
,
- {CONFIG, "proxy.config.log2.rolling_offset_hr", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_STR, "^[0-9]+$", RA_NULL}
+ {CONFIG, "proxy.config.log.rolling_offset_hr", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_STR, "^[0-9]+$", RA_NULL}
,
- {CONFIG, "proxy.config.log2.rolling_size_mb", "", INK_INT, "10", RU_REREAD, RR_NULL, RC_STR, "^0*[1-9][0-9]*$",
+ {CONFIG, "proxy.config.log.rolling_size_mb", "", INK_INT, "10", RU_REREAD, RR_NULL, RC_STR, "^0*[1-9][0-9]*$",
RA_NULL}
,
- {CONFIG, "proxy.config.log2.auto_delete_rolled_files", "", INK_INT, "1", RU_REREAD, RR_NULL, RC_INT, "[0-1]", RA_NULL}
+ {CONFIG, "proxy.config.log.auto_delete_rolled_files", "", INK_INT, "1", RU_REREAD, RR_NULL, RC_INT, "[0-1]", RA_NULL}
,
- {CONFIG, "proxy.config.log2.sampling_frequency", "", INK_INT, "1", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.sampling_frequency", "", INK_INT, "1", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.space_used_frequency", "", INK_INT, "2", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.space_used_frequency", "", INK_INT, "2", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.file_stat_frequency", "", INK_INT, "32", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.file_stat_frequency", "", INK_INT, "32", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.ascii_buffer_size", "", INK_INT, "36864", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.ascii_buffer_size", "", INK_INT, "36864", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.max_line_size", "", INK_INT, "9216", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.max_line_size", "", INK_INT, "9216", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.overspill_report_count", "", INK_INT, "500", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.overspill_report_count", "", INK_INT, "500", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ ,
+ {CONFIG, "proxy.config.log.xuid_logging_enabled", "", INK_INT, "1", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
/* */
/* Begin HCL Modifications. */
/* */
- {CONFIG, "proxy.config.log2.search_rolling_interval_sec", "", INK_INT, "86400", RU_REREAD, RR_NULL, RC_NULL, NULL,
+ {CONFIG, "proxy.config.log.search_rolling_interval_sec", "", INK_INT, "86400", RU_REREAD, RR_NULL, RC_NULL, NULL,
RA_NULL}
,
- {CONFIG, "proxy.config.log2.search_log_enabled", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.search_log_enabled", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.search_server_ip_addr", "", INK_STRING, NULL, RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.search_server_ip_addr", "", INK_STRING, NULL, RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.search_server_port", "", INK_INT, "8080", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.search_server_port", "", INK_INT, "8080", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.search_top_sites", "", INK_INT, "100", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.search_top_sites", "", INK_INT, "100", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.search_url_filter", "", INK_STRING, NULL, RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.search_url_filter", "", INK_STRING, NULL, RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log2.search_log_filters", "", INK_STRING, NULL, RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.log.search_log_filters", "", INK_STRING, NULL, RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
/* */
/* End HCL Modifications. */
@@ -2316,37 +2304,29 @@ RecordElement RecordsConfig[] = {
//#
//##############################################################################
//# bytes moved
- {PROCESS, "proxy.process.log2.bytes_buffered", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {PROCESS, "proxy.process.log.bytes_buffered", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {PROCESS, "proxy.process.log2.bytes_written_to_disk", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {PROCESS, "proxy.process.log.bytes_written_to_disk", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {PROCESS, "proxy.process.log2.bytes_sent_to_network", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {PROCESS, "proxy.process.log.bytes_sent_to_network", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {PROCESS, "proxy.process.log2.bytes_received_from_network", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL,
+ {PROCESS, "proxy.process.log.bytes_received_from_network", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL,
RA_NULL}
,
//# I/O
- {PROCESS, "proxy.process.log2.log_files_open", "", INK_COUNTER, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {PROCESS, "proxy.process.log.log_files_open", "", INK_COUNTER, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {PROCESS, "proxy.process.log2.log_files_space_used", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {PROCESS, "proxy.process.log.log_files_space_used", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
//# events, should be COUNTERs
- {PROCESS, "proxy.process.log2.event_log_error", "", INK_COUNTER, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {PROCESS, "proxy.process.log.event_log_error", "", INK_COUNTER, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {PROCESS, "proxy.process.log2.event_log_access", "", INK_COUNTER, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {PROCESS, "proxy.process.log.event_log_access", "", INK_COUNTER, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {PROCESS, "proxy.process.log2.event_log_access_fail", "", INK_COUNTER, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {PROCESS, "proxy.process.log.event_log_access_fail", "", INK_COUNTER, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {PROCESS, "proxy.process.log2.event_log_access_skip", "", INK_COUNTER, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {PROCESS, "proxy.process.log.event_log_access_skip", "", INK_COUNTER, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- //#
- //# Some resource settings, currently only obeyed by MIXT
- //#
- //##############################################################################
- {CONFIG, "proxy.config.resource.target_maxmem_mb", "", INK_INT, "0", RU_RESTART_TS, RR_NULL, RC_INT, "[0-65536]",
- RA_NULL}
- ,
-
//##############################################################################
//#
@@ -3171,7 +3151,7 @@ RecordElement RecordsConfig[] = {
,
{LOCAL, "proxy.local.outgoing_ip_to_bind", "", INK_STRING, NULL, RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {LOCAL, "proxy.local.log2.collation_mode", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_INT, "[0-4]", RA_NULL}
+ {LOCAL, "proxy.local.log.collation_mode", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_INT, "[0-4]", RA_NULL}
,
//#Prefetch configuration
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/GenericParser.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/GenericParser.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/GenericParser.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/GenericParser.cc Tue Nov 30 01:42:55 2010
@@ -978,8 +978,6 @@ RuleList::parse(char *fileBuf, const cha
m_filetype = INK_FNAME_ICP_PEER; /* icp.config */
} else if (strstr(filename, "ip_allow.config")) {
m_filetype = INK_FNAME_IP_ALLOW; /* ip_allow.config */
- } else if (strstr(filename, "logs.config")) {
- m_filetype = INK_FNAME_UNDEFINED; /* logs.config */
} else if (strstr(filename, "logs_xml.config")) {
m_filetype = INK_FNAME_LOGS_XML; /* logs_xml.config */
} else if (strstr(filename, "mgmt_allow.config")) {
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/INKMgmtAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/INKMgmtAPI.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/INKMgmtAPI.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/INKMgmtAPI.cc Tue Nov 30 01:42:55 2010
@@ -2802,383 +2802,8 @@ INKMgmtFtp(const char *ftpCmd, const cha
return INK_ERR_OKAY;
}
-
-
/* Network conifguration functions */
-
-
-/*-------------------------------------------------------------
- * rmserver.cfg
- *-------------------------------------------------------------*/
-
-char *
-get_rmserver_path()
-{
- char *path = NULL;
-#if defined(linux)
-
- FILE *rec_file;
- int i = 0, num_args = 0;
- char buffer[1024];
- char proxy_restart_cmd[1024];
- char rec_config[1024];
- static char *restart_cmd_args[100];
- INKString tmp;
- INKString tmp2;
-
- Layout::relative_to(rec_config, sizeof(rec_config),
- Layout::get()->sysconfdir, "records.config");
- if ((rec_file = fopen(rec_config, "r")) == NULL) {
- //fprintf(stderr, "Error: unable to open %s.\n", rec_config);
- return NULL;
- }
-
- while (fgets(buffer, 1024, rec_file) != NULL) {
- if (strstr(buffer, "proxy.config.rni.proxy_restart_cmd") != NULL) {
- if ((tmp = strstr(buffer, "STRING ")) != NULL) {
- tmp += strlen("STRING ");
- for (i = 0; tmp[i] != '\n' && tmp[i] != '\0'; i++) {
- proxy_restart_cmd[i] = tmp[i];
- }
- proxy_restart_cmd[i] = '\0';
-
- tmp = proxy_restart_cmd;
- while ((tmp2 = strtok(tmp, " \t")) != NULL) {
- restart_cmd_args[num_args++] = strdup(tmp2);
- tmp = NULL;
- }
- restart_cmd_args[num_args] = NULL;
- }
- }
- }
- fclose(rec_file);
-
- path = restart_cmd_args[num_args - 1];
- //printf("rmservercfgpath: %s \n",path);
-#endif
-
- return path;
-}
-
-
-inkapi INKError rm_change_ip(int cnt, char **ip)
-{
-
-#if defined(linux)
-
- int status;
- char rmserver_path[512], rmserver_path1[512];
- char buf[1024], temp[512];
- FILE *fp;
- FILE *fp1;
- INKString path;
- INKString tmp;
- INKString tmp1;
- pid_t pid;
-
- if (cnt == 0) {
- //fprintf(stderr,"Error:No IP to change!\n");
- return INK_ERR_FAIL;
- }
- if (!ip[0]) {
- //fprintf(stderr,"Error[rm_change_ip]:Null IP passed!\n");
- return INK_ERR_FAIL;
- }
- //printf("ip[0]: %s",ip[0]);
-
-
- path = get_rmserver_path();
- if (!path) {
- //fprintf(stderr,"Error:rmserver.cfg path not found!\n");
- return INK_ERR_FAIL;
- }
- ink_strncpy(temp, path, sizeof(temp));
- ink_strncpy(rmserver_path, path, sizeof(rmserver_path));
-
- tmp = temp;
- if ((tmp1 = strstr(tmp, "/rmserver.cfg")) != NULL)
- tmp[tmp1 - tmp] = '\0';
-
- snprintf(rmserver_path1, sizeof(rmserver_path1), "%s/rmservernew.cfg", tmp);
-
- //printf("rmservercfgpath: %s \n",rmserver_path);
- //printf("new rmserver.cfg path: %s \n",rmserver_path1);
- //printf("cnt: %d \n",cnt);
-
- if ((fp = fopen(rmserver_path, "r")) == NULL) {
- //fprintf(stderr, "Error: unable to open rmserver.cfg\n");
- return INK_ERR_READ_FILE;
- }
- if ((fp1 = fopen(rmserver_path1, "w")) == NULL) {
- //fprintf(stderr, "Error: unable to create new rmserver.cfg\n");
- return INK_ERR_WRITE_FILE;
- }
-
- NOWARN_UNUSED_RETURN(fgets(buf, 1024, fp));
- while (!feof(fp)) {
- if (strstr(buf, "ProxyHost")) {
- //printf("%s \n",buf);
- fprintf(fp1, "<Var ProxyHost=\"%s\"/> \n", ip[0]);
- } else if (strstr(buf, "RedirectToAddress")) {
- //printf("%s \n",buf);
- fprintf(fp1, "<Var RedirectToAddress=\"%s\"/> \n", ip[0]);
- } else if (strstr(buf, "Address_01")) {
- //printf("%s \n",buf);
- // Currently we always put 0.0.0.0 since this solves all kinds of problems the field encountered
- //for(i = 0;i < cnt;i++) {
- // if(!ip[i]) {
- // fprintf(stderr,"Error[rm_change_ip]:Null IP passed!\n");
- // return INK_ERR_FAIL;
- // }
- fprintf(fp1, "<Var Address_01=\"0.0.0.0\"/> \n");
- //}
- } else
- fputs(buf, fp1);
- NOWARN_UNUSED_RETURN(fgets(buf, 1024, fp));
- }
- fclose(fp);
- fclose(fp1);
-
- const char *mv_binary = "/bin/mv";
-
- if ((pid = fork()) < 0) {
- exit(1);
- } else if (pid > 0) {
- wait(&status);
- } else {
- int res;
- res = execl(mv_binary, "mv", rmserver_path1, rmserver_path, (char*)NULL);
- if (res != 0) {
- perror("[rm_change_ip] mv of rmserver.cfg failed! ");
- }
- _exit(res);
- }
-
-#endif
-
- return INK_ERR_OKAY;
-}
-
-inkapi INKError rm_remove_ip(int cnt, char **ip)
-{
-
-#if defined(linux)
-
- int i, status, flag;
- char rmserver_path[512], rmserver_path1[512];
- char buf[1024], temp[512];
- FILE *fp;
- FILE *fp1;
- INKString path;
- INKString tmp;
- INKString tmp1;
- pid_t pid;
-
- if (cnt == 0) {
- //fprintf(stderr,"Error[rm_remove_ip]:No IP to change!\n");
- return INK_ERR_FAIL;
- }
- if (!ip[0]) {
- //fprintf(stderr,"Error[rm_remove_ip]:Null IP passed!\n");
- return INK_ERR_FAIL;
- }
- //printf("ip[0]: %s",ip[0]);
-
- path = get_rmserver_path();
- if (!path) {
- //fprintf(stderr,"Error:rmserver.cfg path not found!\n");
- return INK_ERR_FAIL;
- }
- ink_strncpy(temp, path, sizeof(temp));
- ink_strncpy(rmserver_path, path, sizeof(rmserver_path));
-
- tmp = temp;
- if ((tmp1 = strstr(tmp, "/rmserver.cfg")) != NULL)
- tmp[tmp1 - tmp] = '\0';
-
- snprintf(rmserver_path1, sizeof(rmserver_path1), "%s/rmservernew.cfg", tmp);
-
- //printf("rmservercfgpath: %s \n",rmserver_path);
- //printf("new rmserver.cfg path: %s \n",rmserver_path1);
-
- if ((fp = fopen(rmserver_path, "r")) == NULL) {
- //fprintf(stderr, "Error: unable to open rmserver.cfg\n");
- return INK_ERR_READ_FILE;
- }
- if ((fp1 = fopen(rmserver_path1, "w")) == NULL) {
- //fprintf(stderr, "Error: unable to create new rmserver.cfg\n");
- return INK_ERR_WRITE_FILE;
- }
-
- NOWARN_UNUSED_RETURN(fgets(buf, 1024, fp));
- while (!feof(fp)) {
- if (strstr(buf, "Address_01")) {
- //printf("%s \n",buf);
- flag = 0;
- for (i = 0; i < cnt; i++) {
- if (!ip[i]) {
- //fprintf(stderr,"Error[rm_remove_ip]:Null IP passed!\n");
- fclose(fp);
- fclose(fp1);
- return INK_ERR_FAIL;
- }
- if (strstr(buf, ip[i])) {
- flag = 1;
- break;
- }
- }
- if (flag == 0)
- fputs(buf, fp1);
- } else
- fputs(buf, fp1);
- NOWARN_UNUSED_RETURN(fgets(buf, 1024, fp));
- }
- fclose(fp);
- fclose(fp1);
-
- const char *mv_binary = "/bin/mv";
- if ((pid = fork()) < 0) {
- exit(1);
- } else if (pid > 0) {
- wait(&status);
- } else { /* Exec the up */
- int res;
- res = execl(mv_binary, "mv", rmserver_path1, rmserver_path, (char*)NULL);
- if (res != 0) {
- perror("[rm_remove_ip] mv of rmserver.cfg failed! ");
- }
- _exit(res);
- }
-
-#endif
-
- return INK_ERR_OKAY;
-}
-
-
-inkapi INKError rm_change_hostname(INKString hostname)
-{
-
-#if defined(linux)
-
- char rmserver_path[512], rmserver_path1[512];
- char buf[1024], temp[512];
- FILE *fp;
- FILE *fp1;
- INKString path = NULL, tmp = NULL, tmp1 = NULL, part1 = NULL, part3 = NULL;
- int status;
- pid_t pid;
-
- if (!hostname) {
- //fprintf(stderr,"Error[rm_change_hostname]:no hostname specified!\n");
- return INK_ERR_FAIL;
- }
-
- path = get_rmserver_path();
- if (!path) {
- //fprintf(stderr,"Error[rm_change_hostname]:rmserver.cfg path not found!\n");
- return INK_ERR_FAIL;
- }
- ink_strncpy(temp, path, sizeof(temp));
- ink_strncpy(rmserver_path, path, sizeof(rmserver_path));
-
- tmp = temp;
- if ((tmp1 = strstr(tmp, "/rmserver.cfg")) != NULL)
- tmp[tmp1 - tmp] = '\0';
-
- snprintf(rmserver_path1, sizeof(rmserver_path1), "%s/rmservernew.cfg", tmp);
- //printf("rmserver new path: %s\n",rmserver_path1);
- if ((fp = fopen(rmserver_path, "r")) == NULL) {
- //fprintf(stderr, "Error: unable to open rmserver.cfg\n");
- return INK_ERR_READ_FILE;
- }
- if ((fp1 = fopen(rmserver_path1, "w")) == NULL) {
- //fprintf(stderr, "Error: unable to create new rmserver.cfg\n");
- return INK_ERR_WRITE_FILE;
- }
-
- NOWARN_UNUSED_RETURN(fgets(buf, 1024, fp));
- tmp1 = NULL;
- while (!feof(fp)) {
- if (strstr(buf, "Realm=")) {
- //printf("%s \n",buf);
- if ((tmp = strstr(buf, "\"")) != NULL) {
- if (tmp1)
- free(tmp1);
- tmp1 = strdup(tmp + 1);
- //printf("rem: %s,i\n",tmp1);
- }
- if ((tmp = strtok(buf, "\"")) != NULL) {
- if (part1)
- free(part1);
- part1 = strdup(tmp + 1);
- //printf("part1:%s \n",part1);
- }
- if (tmp1) {
- tmp = strstr(tmp1, "Connect");
- if (tmp != NULL) {
- if (part3)
- free(part3);
- part3 = strdup(tmp);
- //printf("part3: %s,i\n",part3);
- } else {
- tmp = strstr(tmp1, "Admin");
- if (tmp != NULL) {
- if (part3)
- free(part3);
- part3 = strdup(tmp);
- //printf("part3: %s,i\n",part3);
- }
- }
- }
- if (!part1 || !part3) {
- //fprintf(stderr,"Error[rm_change_hostname]:realm string not proper!\n");
- if (tmp1)
- free(tmp1);
- if (part1)
- free(part1);
- if (part3)
- free(part3);
- fclose(fp);
- fclose(fp1);
- return INK_ERR_FAIL;
- }
- //printf("hostname: %s\n",hostname);
- //printf("%s\"%s.%s",part1,hostname,part3);
- fprintf(fp1, "%s\"%s.%s", part1, hostname, part3);
- } else
- fputs(buf, fp1);
- NOWARN_UNUSED_RETURN(fgets(buf, 1024, fp));
- }
- if (tmp1)
- free(tmp1);
- if (part1)
- free(part1);
- if (part3)
- free(part3);
- fclose(fp);
- fclose(fp1);
-
- const char *mv_binary = "/bin/mv";
- if ((pid = fork()) < 0) {
- exit(1);
- } else if (pid > 0) {
- wait(&status);
- } else { /* Exec the up */
- int res;
- res = execl(mv_binary, "mv", rmserver_path1, rmserver_path, (char*)NULL);
- if (res != 0) {
- perror("[rm_change_hostname] mv of rmserver.cfg failed! ");
- }
- _exit(res);
- }
-
-#endif
-
- return INK_ERR_OKAY;
-}
-
// close all file descriptors belong to process specified by pid
void
closeAllFds()
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/INKMgmtAPIStub.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/INKMgmtAPIStub.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/INKMgmtAPIStub.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/INKMgmtAPIStub.cc Tue Nov 30 01:42:55 2010
@@ -379,18 +379,6 @@ INKIcpEleDestory(INKIcpEle * ele)
return;
}
-inkapi INKLdapSrvrEle *
-INKLdapSrvrEleCreate()
-{
- return NULL;
-}
-
-inkapi void
-INKLdapSrvrEleDestroy(INKLdapSrvrEle * ele)
-{
- return;
-}
-
inkapi INKLogFilterEle *
INKLogFilterEleCreate()
{
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/MgmtPlugin.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/MgmtPlugin.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/MgmtPlugin.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/MgmtPlugin.cc Tue Nov 30 01:42:55 2010
@@ -150,21 +150,21 @@ mgmt_plugin_load(int argc, char *argv[])
handles.regist(handle);
// coverity[noescape]
- init_func_w_handle_t inith = (init_func_w_handle_t) dll_findsym(handle, "INKPluginInitwDLLHandle");
+ init_func_w_handle_t inith = (init_func_w_handle_t) dll_findsym(handle, "TSPluginInitwDLLHandle");
if (inith) {
inith(handle, argc, argv);
return;
}
- init = (init_func_t) dll_findsym(handle, "INKPluginInit");
+ init = (init_func_t) dll_findsym(handle, "TSPluginInit");
if (!init) {
- Warning("[mgmt_plugin_load] unable to find INKPluginInit function '%s': %s", path, dll_error(handle));
+ Warning("[mgmt_plugin_load] unable to find TSPluginInit function '%s': %s", path, dll_error(handle));
dll_close(handle);
return;
}
// coverity[noescape]
// coverity[leaked_storage]
- init(argc, argv); // call plug-in's INKPluginInit
+ init(argc, argv); // call plug-in's TSPluginInit
}
//
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/include/INKMgmtAPI.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/include/INKMgmtAPI.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/include/INKMgmtAPI.h (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/include/INKMgmtAPI.h Tue Nov 30 01:42:55 2010
@@ -347,7 +347,7 @@ typedef enum
INK_METHOD_POST,
INK_METHOD_PUT,
INK_METHOD_TRACE,
- INK_METHOD_PUSH, /* only valid with filter.config */
+ INK_METHOD_PUSH,
INK_METHOD_UNDEFINED
} INKMethodT;
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/remote/APITestCliRemote.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/remote/APITestCliRemote.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/remote/APITestCliRemote.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/remote/APITestCliRemote.cc Tue Nov 30 01:42:55 2010
@@ -1533,7 +1533,7 @@ test_read_url(bool valid)
/* ------------------------------------------------------------------------
* test_read_file
* ------------------------------------------------------------------------
- * reads filter.config file and prints it out
+ * reads hosting.config file and prints it out
*/
void
test_read_file()
@@ -1555,7 +1555,7 @@ test_read_file()
/* ------------------------------------------------------------------------
* test_write_file
* ------------------------------------------------------------------------
- * writes filter.config with some garbage text then reads the file and
+ * writes hosting.config with some garbage text then reads the file and
* prints the new file to stdout
*/
void
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/remote/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/remote/Makefile.am?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/remote/Makefile.am (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/remote/Makefile.am Tue Nov 30 01:42:55 2010
@@ -24,7 +24,9 @@ AM_CPPFLAGS = \
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
-noinst_PROGRAMS = traffic_api_cli_remote
+if BUILD_TESTS
+ noinst_PROGRAMS = traffic_api_cli_remote
+endif
noinst_LIBRARIES = libmgmtapiremote.a
libmgmtapiremote_a_SOURCES = \
@@ -41,7 +43,10 @@ libmgmtapiremote_a_SOURCES = \
NetworkUtilsRemote.cc \
NetworkUtilsRemote.h
-traffic_api_cli_remote_SOURCES = APITestCliRemote.cc
+if BUILD_TESTS
+ traffic_api_cli_remote_SOURCES = APITestCliRemote.cc
+endif
+
traffic_api_cli_remote_LDADD = \
libmgmtapiremote.a \
$(top_builddir)/iocore/utils/libinkutils.a \
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/cli/CLImonitor.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/cli/CLImonitor.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/cli/CLImonitor.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/cli/CLImonitor.cc Tue Nov 30 01:42:55 2010
@@ -302,19 +302,19 @@ const
"Connections in progress", "%-*s %*s\n",
10, 10, 50, 3},
// LOGGING - 5
- {"proxy.process.log2.log_files_open\\c", NULL,
+ {"proxy.process.log.log_files_open\\c", NULL,
"Currently Open Log Files", "%-*s %*s\n",
10, 10, 50, 3},
- {"proxy.process.log2.log_files_space_used\\b", NULL,
+ {"proxy.process.log.log_files_space_used\\b", NULL,
"Space Used For Log Files", "%-*s %*s\n",
10, 10, 50, 3},
- {"proxy.process.log2.event_log_access\\c", NULL,
+ {"proxy.process.log.event_log_access\\c", NULL,
"Number of Access Events Logged", "%-*s %*s\n",
10, 10, 50, 3},
- {"proxy.process.log2.event_log_access_skip\\c", NULL,
+ {"proxy.process.log.event_log_access_skip\\c", NULL,
"Number of Access Events Skipped", "%-*s %*s\n",
10, 10, 50, 3},
- {"proxy.process.log2.event_log_error\\c", NULL,
+ {"proxy.process.log.event_log_error\\c", NULL,
"Number of Error Events Logged", "%-*s %*s\n",
10, 10, 50, 3}
};
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/cli/CLImonitor.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/cli/CLImonitor.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/cli/CLImonitor.h (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/cli/CLImonitor.h Tue Nov 30 01:42:55 2010
@@ -41,9 +41,8 @@ struct CLI_monitor
#define NUM_PROT_HTTP_UA_DESCS 4
#define NUM_PROT_HTTP_OS_DESCS 4
#define NUM_PROT_ICP_DESCS 11
-#define NUM_PROT_RNI_DESCS 13
/*-------------------------------*/
-#define NUM_PROT_DESCS 32
+#define NUM_PROT_DESCS 19
static const CLI_globals::VarNameDesc mon_prot_desctable[NUM_PROT_DESCS];
#define NUM_NODE_CACHE_DESCS 3
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/cli/CliMain.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/cli/CliMain.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/cli/CliMain.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/cli/CliMain.cc Tue Nov 30 01:42:55 2010
@@ -323,10 +323,8 @@ main(int argc, char **argv)
/* Argument description table used to describe how to parse command line args, */
/* see 'ink_args.h' for meanings of the various fields */
ArgumentDescription argument_descriptions[] = {
-#ifndef RNI_ONLY
// INKqa10516
/*{ "interactive", 'i', "Interactive Mode", "F", &interactiveMode, "CLI_INTERACTIVE", NULL}, */
-#endif /* RNI_ONLY */
#ifndef _WIN32
{"query_deadhosts", 'q', "Query congested sites", "F", &QueryDeadhosts, NULL, NULL},
{"socket_path", 'p', "Socket Path", "S255", &cli->sockPath, "CLI_SOCKPATH", NULL},
@@ -393,17 +391,12 @@ main(int argc, char **argv)
}
#endif
-#ifndef RNI_ONLY
// Interactive or batch mode
if (interactiveMode == 1) {
runInteractive(cli);
} else {
handleArgInvocation(cli);
}
-#else /* RNI_ONLY */
- /* Interactive mode not allowed */
- handleArgInvocation(cli);
-#endif /* RNI_ONLY */
delete cli;