You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2010/05/19 23:06:42 UTC
svn commit: r946395 [8/8] - in /trafficserver/traffic/trunk:
example/app-template/ iocore/aio/ iocore/block-cache/ iocore/cache/
iocore/cluster/ iocore/dns/ iocore/eventsystem/ iocore/hostdb/
iocore/hostdb/include/ iocore/net/ iocore/utils/ libinktomi+...
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/NetworkUtilsLocal.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/NetworkUtilsLocal.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/NetworkUtilsLocal.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/NetworkUtilsLocal.cc Wed May 19 21:06:35 2010
@@ -187,7 +187,7 @@ preprocess_msg(struct SocketInfo sock_in
{
INKError ret;
int req_len;
- ink16 op;
+ int16 op;
// read operation type
ret = socket_read_n(sock_info, (char *) &op, SIZE_OP_T);
@@ -267,7 +267,7 @@ Lerror:
INKError
parse_file_read_request(char *req, INKFileNameT * file)
{
- ink16 file_t;
+ int16 file_t;
if (!req || !file)
return INK_ERR_PARAMS;
@@ -294,8 +294,8 @@ parse_file_read_request(char *req, INKFi
INKError
parse_file_write_request(char *req, INKFileNameT * file, int *ver, int *size, char **text)
{
- ink16 file_t, f_ver;
- ink32 f_size;
+ int16 file_t, f_ver;
+ int32 f_size;
// check input is non-NULL
if (!req || !file || !ver || !size || !text)
@@ -336,7 +336,7 @@ parse_file_write_request(char *req, INKF
INKError
parse_request_name_value(char *req, char **name_1, char **val_1)
{
- ink32 name_len, val_len;
+ int32 name_len, val_len;
char *name, *val;
if (!req || !name_1 || !val_1)
@@ -380,8 +380,8 @@ parse_request_name_value(char *req, char
INKError
parse_diags_request(char *req, INKDiagsT * mode, char **diag_msg)
{
- ink16 diag_t;
- ink32 msg_len;
+ int16 diag_t;
+ int32 msg_len;
// check input is non-NULL
if (!req || !mode || !diag_msg)
@@ -416,7 +416,7 @@ parse_diags_request(char *req, INKDiagsT
INKError
parse_proxy_state_request(char *req, INKProxyStateT * state, INKCacheClearT * clear)
{
- ink16 state_t, cache_t;
+ int16 state_t, cache_t;
// check input is non-NULL
if (!req || !state || !clear)
@@ -456,10 +456,10 @@ send_reply(struct SocketInfo sock_info,
{
INKError ret;
char msg[SIZE_ERR_T];
- ink16 ret_val;
+ int16 ret_val;
// write the return value
- ret_val = (ink16) retval;
+ ret_val = (int16) retval;
memcpy(msg, (void *) &ret_val, SIZE_ERR_T);
// now push it to the socket
@@ -486,8 +486,8 @@ send_reply_list(struct SocketInfo sock_i
INKError ret;
int msg_pos = 0, total_len;
char *msg;
- ink16 ret_val;
- ink32 list_size; // to be safe, typecast
+ int16 ret_val;
+ int32 list_size; // to be safe, typecast
if (!list) {
return INK_ERR_PARAMS;
@@ -499,12 +499,12 @@ send_reply_list(struct SocketInfo sock_i
return INK_ERR_SYS_CALL; // ERROR - malloc failed
// write the return value
- ret_val = (ink16) retval;
+ ret_val = (int16) retval;
memcpy(msg, (void *) &ret_val, SIZE_ERR_T);
msg_pos += SIZE_ERR_T;
// write the length of the string list
- list_size = (ink32) strlen(list);
+ list_size = (int32) strlen(list);
memcpy(msg + msg_pos, (void *) &list_size, SIZE_LEN);
msg_pos += SIZE_LEN;
@@ -539,8 +539,8 @@ send_record_get_reply(struct SocketInfo
INKError ret;
int msg_pos = 0, total_len;
char *msg;
- ink16 record_t, ret_val;
- ink32 v_size; // to be safe, typecast
+ int16 record_t, ret_val;
+ int32 v_size; // to be safe, typecast
if (!val) {
return INK_ERR_PARAMS;
@@ -552,17 +552,17 @@ send_record_get_reply(struct SocketInfo
return INK_ERR_SYS_CALL; // ERROR - malloc failed
// write the return value
- ret_val = (ink16) retval;
+ ret_val = (int16) retval;
memcpy(msg, (void *) &ret_val, SIZE_ERR_T);
msg_pos += SIZE_ERR_T;
// write the size of the record value
- v_size = (ink32) val_size;
+ v_size = (int32) val_size;
memcpy(msg + msg_pos, (void *) &v_size, SIZE_LEN);
msg_pos += SIZE_LEN;
// write the record type
- record_t = (ink16) rec_type;
+ record_t = (int16) rec_type;
memcpy(msg + msg_pos, (void *) &record_t, SIZE_REC_T);
msg_pos += SIZE_REC_T;
@@ -592,7 +592,7 @@ send_record_set_reply(struct SocketInfo
INKError ret;
int total_len;
char *msg;
- ink16 action_t, ret_val;
+ int16 action_t, ret_val;
total_len = SIZE_ERR_T + SIZE_ACTION_T;
msg = (char *) xmalloc(sizeof(char) * total_len);
@@ -600,11 +600,11 @@ send_record_set_reply(struct SocketInfo
return INK_ERR_SYS_CALL; // ERROR - malloc failed!
// write the return value
- ret_val = (ink16) retval;
+ ret_val = (int16) retval;
memcpy(msg, (void *) &ret_val, SIZE_ERR_T);
// write the action needed
- action_t = (ink16) action_need;
+ action_t = (int16) action_need;
memcpy(msg + SIZE_ERR_T, (void *) &action_t, SIZE_ACTION_T);
// now push it to the socket
@@ -634,8 +634,8 @@ send_file_read_reply(struct SocketInfo s
INKError ret;
int msg_pos = 0, msg_len;
char *msg;
- ink16 ret_val, f_ver;
- ink32 f_size; // to be safe
+ int16 ret_val, f_ver;
+ int32 f_size; // to be safe
if (!text)
return INK_ERR_PARAMS;
@@ -647,17 +647,17 @@ send_file_read_reply(struct SocketInfo s
return INK_ERR_SYS_CALL;
// write the return value
- ret_val = (ink16) retval;
+ ret_val = (int16) retval;
memcpy(msg, (void *) &ret_val, SIZE_ERR_T);
msg_pos += SIZE_ERR_T;
// write file version
- f_ver = (ink16) ver;
+ f_ver = (int16) ver;
memcpy(msg + msg_pos, (void *) &f_ver, SIZE_VER);
msg_pos += SIZE_VER;
// write file size
- f_size = (ink32) size;
+ f_size = (int32) size;
memcpy(msg + msg_pos, (void *) &f_size, SIZE_LEN);
msg_pos += SIZE_LEN;
@@ -688,10 +688,10 @@ send_proxy_state_get_reply(struct Socket
{
INKError ret;
char msg[SIZE_PROXY_T];
- ink16 state_t;
+ int16 state_t;
// write the state
- state_t = (ink16) state;
+ state_t = (int16) state;
memcpy(msg, (void *) &state_t, SIZE_PROXY_T);
// now push it to the socket
@@ -718,7 +718,7 @@ send_event_active_reply(struct SocketInf
INKError ret;
int total_len;
char *msg;
- ink16 is_active, ret_val;
+ int16 is_active, ret_val;
total_len = SIZE_ERR_T + SIZE_BOOL;
msg = (char *) xmalloc(sizeof(char) * total_len);
@@ -726,11 +726,11 @@ send_event_active_reply(struct SocketInf
return INK_ERR_SYS_CALL; // ERROR - malloc failed!
// write the return value
- ret_val = (ink16) retval;
+ ret_val = (int16) retval;
memcpy(msg, (void *) &ret_val, SIZE_ERR_T);
// write the boolean active state
- is_active = (ink16) active;
+ is_active = (int16) active;
memcpy(msg + SIZE_ERR_T, (void *) &is_active, SIZE_BOOL);
// now push it to the socket
@@ -757,8 +757,8 @@ send_event_notification(struct SocketInf
INKError ret;
int total_len, name_len, desc_len;
char *msg;
- ink16 op_t;
- ink32 len;
+ int16 op_t;
+ int32 len;
if (!event || !event->name || !event->description)
return INK_ERR_PARAMS;
@@ -771,18 +771,18 @@ send_event_notification(struct SocketInf
return INK_ERR_SYS_CALL; // ERROR - malloc failed!
// write the operation
- op_t = (ink16) EVENT_NOTIFY;
+ op_t = (int16) EVENT_NOTIFY;
memcpy(msg, (void *) &op_t, SIZE_OP_T);
// write the size of the event name
- len = (ink32) name_len;
+ len = (int32) name_len;
memcpy(msg + SIZE_OP_T, (void *) &len, SIZE_LEN);
// write the event name
memcpy(msg + SIZE_OP_T + SIZE_LEN, event->name, name_len);
// write size of description
- len = (ink32) desc_len;
+ len = (int32) desc_len;
memcpy(msg + SIZE_OP_T + SIZE_LEN + name_len, (void *) &len, SIZE_LEN);
// write the description
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/TSControlMain.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/TSControlMain.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/TSControlMain.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/TSControlMain.cc Wed May 19 21:06:35 2010
@@ -100,7 +100,7 @@ void
remove_client(ClientT * client, InkHashTable * table)
{
// close client socket
- ink_close_socket(client->sock_info.fd); // close client socket
+ close_socket(client->sock_info.fd); // close client socket
// remove client binding from hash table
ink_hash_table_delete(table, (char *) &client->sock_info.fd);
@@ -435,14 +435,14 @@ ts_ctrl_main(void *arg)
// if we get here something's wrong, just clean up
Debug("ts_main", "[ts_ctrl_main] CLOSING AND SHUTTING DOWN OPERATIONS\n");
- ink_close_socket(con_socket_fd);
+ close_socket(con_socket_fd);
// iterate through hash table; close client socket connections and remove entry
con_entry = ink_hash_table_iterator_first(accepted_con, &con_state);
while (con_entry) {
client_entry = (ClientT *) ink_hash_table_entry_value(accepted_con, con_entry);
if (client_entry->sock_info.fd >= 0) {
- ink_close_socket(client_entry->sock_info.fd); // close socket
+ close_socket(client_entry->sock_info.fd); // close socket
}
ink_hash_table_delete(accepted_con, (char *) &client_entry->sock_info.fd); // remove binding
delete_client(client_entry); // free ClientT
@@ -742,7 +742,7 @@ handle_reconfigure(struct SocketInfo soc
INKError
handle_restart(struct SocketInfo sock_info, char *req)
{
- ink16 cluster;
+ int16 cluster;
INKError ret;
if (!req) {
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/CoreAPIRemote.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/CoreAPIRemote.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/CoreAPIRemote.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/CoreAPIRemote.cc Wed May 19 21:06:35 2010
@@ -492,7 +492,7 @@ MgmtRecordSet(const char *rec_name, cons
}
// first convert the MgmtInt into a string
-// NOTE: use long long, not just long, MgmtInt = ink64
+// NOTE: use long long, not just long, MgmtInt = int64
INKError
MgmtRecordSetInt(const char *rec_name, MgmtInt int_val, INKActionNeedT * action_need)
{
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/NetworkUtilsRemote.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/NetworkUtilsRemote.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/NetworkUtilsRemote.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/NetworkUtilsRemote.cc Wed May 19 21:06:35 2010
@@ -90,12 +90,12 @@ int
socket_test(int fd)
{
char msg[6]; /* 6 = SIZE_OP + SIZE_LEN */
- ink16 op;
- ink32 msg_len = 0;
+ int16 op;
+ int32 msg_len = 0;
int ret, amount_read = 0;
// write the op
- op = (ink16) UNDEFINED_OP;
+ op = (int16) UNDEFINED_OP;
memcpy(msg, (void *) &op, SIZE_OP_T);
// write msg-len = 0
@@ -488,13 +488,13 @@ socket_test_thread(void *arg)
INKError
send_request(int fd, OpType op)
{
- ink16 op_t;
- ink32 msg_len;
+ int16 op_t;
+ int32 msg_len;
char msg_buf[SIZE_OP_T + SIZE_LEN];
INKError err;
// fill in op type
- op_t = (ink16) op;
+ op_t = (int16) op;
memcpy(msg_buf, &op_t, SIZE_OP_T);
// fill in msg_len == 0
@@ -519,15 +519,15 @@ INKError
send_request_name(int fd, OpType op, char *name)
{
char *msg_buf;
- ink16 op_t;
- ink32 msg_len;
+ int16 op_t;
+ int32 msg_len;
int total_len;
INKError err;
if (name == NULL) { //reg callback for all events when op==EVENT_REG_CALLBACK
msg_len = 0;
} else {
- msg_len = (ink32) strlen(name);
+ msg_len = (int32) strlen(name);
}
total_len = SIZE_OP_T + SIZE_LEN + msg_len;
@@ -536,7 +536,7 @@ send_request_name(int fd, OpType op, cha
return INK_ERR_SYS_CALL;
// fill in op type
- op_t = (ink16) op;
+ op_t = (int16) op;
memcpy(msg_buf, (void *) &op_t, SIZE_OP_T);
// fill in msg_len
@@ -568,8 +568,8 @@ send_request_name_value(int fd, OpType o
{
char *msg_buf;
int msg_pos = 0, total_len;
- ink32 msg_len, name_len, val_size; // these are written to msg
- ink16 op_t;
+ int32 msg_len, name_len, val_size; // these are written to msg
+ int16 op_t;
INKError err;
if (!name || !value)
@@ -585,7 +585,7 @@ send_request_name_value(int fd, OpType o
return INK_ERR_SYS_CALL;
// fill in op type
- op_t = (ink16) op;
+ op_t = (int16) op;
memcpy(msg_buf + msg_pos, (void *) &op_t, SIZE_OP_T);
msg_pos += SIZE_OP_T;
@@ -629,8 +629,8 @@ send_file_read_request(int fd, INKFileNa
{
char *msg_buf;
int msg_pos = 0, total_len;
- ink32 msg_len = (ink32) SIZE_FILE_T; //marshalled values
- ink16 op, file_t;
+ int32 msg_len = (int32) SIZE_FILE_T; //marshalled values
+ int16 op, file_t;
INKError err;
total_len = SIZE_OP_T + SIZE_LEN + SIZE_FILE_T;
@@ -639,7 +639,7 @@ send_file_read_request(int fd, INKFileNa
return INK_ERR_SYS_CALL;
// fill in op type
- op = (ink16) FILE_READ;
+ op = (int16) FILE_READ;
memcpy(msg_buf + msg_pos, &op, SIZE_OP_T);
msg_pos += SIZE_OP_T;
@@ -648,7 +648,7 @@ send_file_read_request(int fd, INKFileNa
msg_pos += SIZE_LEN;
// fill in file type
- file_t = (ink16) file;
+ file_t = (int16) file;
memcpy(msg_buf + msg_pos, &file_t, SIZE_FILE_T);
// send message
@@ -675,8 +675,8 @@ send_file_write_request(int fd, INKFileN
{
char *msg_buf;
int msg_pos = 0, total_len;
- ink32 msg_len, f_size; //marshalled values
- ink16 op, file_t, f_ver;
+ int32 msg_len, f_size; //marshalled values
+ int16 op, file_t, f_ver;
INKError err;
if (!text)
@@ -689,7 +689,7 @@ send_file_write_request(int fd, INKFileN
return INK_ERR_SYS_CALL;
// fill in op type
- op = (ink16) FILE_WRITE;
+ op = (int16) FILE_WRITE;
memcpy(msg_buf + msg_pos, &op, SIZE_OP_T);
msg_pos += SIZE_OP_T;
@@ -698,17 +698,17 @@ send_file_write_request(int fd, INKFileN
msg_pos += SIZE_LEN;
// fill in file type
- file_t = (ink16) file;
+ file_t = (int16) file;
memcpy(msg_buf + msg_pos, &file_t, SIZE_FILE_T);
msg_pos += SIZE_FILE_T;
// fill in file version
- f_ver = (ink16) ver;
+ f_ver = (int16) ver;
memcpy(msg_buf + msg_pos, &f_ver, SIZE_VER);
msg_pos += SIZE_VER;
// fill in file size
- f_size = (ink32) size; //typecase to be safe
+ f_size = (int32) size; //typecase to be safe
memcpy(msg_buf + msg_pos, &f_size, SIZE_LEN);
msg_pos += SIZE_LEN;
@@ -736,8 +736,8 @@ send_record_get_request(int fd, char *re
{
char *msg_buf;
int msg_pos = 0, total_len;
- ink16 op;
- ink32 msg_len;
+ int16 op;
+ int32 msg_len;
INKError err;
if (!rec_name)
@@ -749,12 +749,12 @@ send_record_get_request(int fd, char *re
return INK_ERR_SYS_CALL;
// fill in op type
- op = (ink16) RECORD_GET;
+ op = (int16) RECORD_GET;
memcpy(msg_buf + msg_pos, (void *) &op, SIZE_OP_T);
msg_pos += SIZE_OP_T;
// fill in msg length
- msg_len = (ink32) strlen(rec_name);
+ msg_len = (int32) strlen(rec_name);
memcpy(msg_buf + msg_pos, (void *) &msg_len, SIZE_LEN);
msg_pos += SIZE_LEN;
@@ -799,8 +799,8 @@ send_proxy_state_get_request(int fd)
INKError
send_proxy_state_set_request(int fd, INKProxyStateT state, INKCacheClearT clear)
{
- ink16 op, state_t, cache_t;
- ink32 msg_len;
+ int16 op, state_t, cache_t;
+ int32 msg_len;
int total_len;
char *msg_buf;
INKError err;
@@ -811,19 +811,19 @@ send_proxy_state_set_request(int fd, INK
return INK_ERR_SYS_CALL;
// fill in op type
- op = (ink16) PROXY_STATE_SET;
+ op = (int16) PROXY_STATE_SET;
memcpy(msg_buf, (void *) &op, SIZE_OP_T);
// fill in msg_len
- msg_len = (ink32) (SIZE_PROXY_T + SIZE_TS_ARG_T);
+ msg_len = (int32) (SIZE_PROXY_T + SIZE_TS_ARG_T);
memcpy(msg_buf + SIZE_OP_T, (void *) &msg_len, SIZE_LEN);
// fill in proxy state
- state_t = (ink16) state;
+ state_t = (int16) state;
memcpy(msg_buf + SIZE_OP_T + SIZE_LEN, (void *) &state_t, SIZE_PROXY_T);
// fill in cache clearing option
- cache_t = (ink16) clear;
+ cache_t = (int16) clear;
memcpy(msg_buf + SIZE_OP_T + SIZE_LEN + SIZE_PROXY_T, (void *) &cache_t, SIZE_TS_ARG_T);
// send message
@@ -846,8 +846,8 @@ INKError
send_restart_request(int fd, bool cluster)
{
char *msg_buf;
- ink16 op, clust_t;
- ink32 msg_len;
+ int16 op, clust_t;
+ int32 msg_len;
int total_len;
INKError err;
@@ -857,11 +857,11 @@ send_restart_request(int fd, bool cluste
return INK_ERR_SYS_CALL;
// fill in op type
- op = (ink16) RESTART;
+ op = (int16) RESTART;
memcpy(msg_buf, (void *) &op, SIZE_OP_T);
// fill in msg_len = SIZE_BOOL
- msg_len = (ink32) SIZE_BOOL;
+ msg_len = (int32) SIZE_BOOL;
memcpy(msg_buf + SIZE_OP_T, (void *) &msg_len, SIZE_LEN);
// fill in cluster?; true=0, false=1
@@ -1012,15 +1012,15 @@ INKError
send_diags_msg(int fd, INKDiagsT mode, const char *diag_msg)
{
char *msg_buf;
- ink16 op_t, diag_t;
- ink32 msg_len, diag_msg_len;
+ int16 op_t, diag_t;
+ int32 msg_len, diag_msg_len;
int total_len;
INKError err;
if (!diag_msg)
return INK_ERR_PARAMS;
- diag_msg_len = (ink32) strlen(diag_msg);
+ diag_msg_len = (int32) strlen(diag_msg);
msg_len = SIZE_DIAGS_T + SIZE_LEN + diag_msg_len;
total_len = SIZE_OP_T + SIZE_LEN + msg_len;
msg_buf = (char *) xmalloc(sizeof(char) * total_len);
@@ -1028,14 +1028,14 @@ send_diags_msg(int fd, INKDiagsT mode, c
return INK_ERR_SYS_CALL;
// fill in op type
- op_t = (ink16) DIAGS;
+ op_t = (int16) DIAGS;
memcpy(msg_buf, (void *) &op_t, SIZE_OP_T);
// fill in entire msg len
memcpy(msg_buf + SIZE_OP_T, (void *) &msg_len, SIZE_LEN);
// fill in INKDiagsT
- diag_t = (ink16) mode;
+ diag_t = (int16) mode;
memcpy(msg_buf + SIZE_OP_T + SIZE_LEN, (void *) &diag_t, SIZE_DIAGS_T);
// fill in diags msg_len
@@ -1083,7 +1083,7 @@ INKError
parse_reply(int fd)
{
int ret, amount_read = 0;
- ink16 ret_val;
+ int16 ret_val;
// check to see if anything to read; wait for specified time = 1 sec
if (socket_read_timeout(fd, MAX_TIME_WAIT, 0) <= 0) { // time expires before ready to read
@@ -1126,8 +1126,8 @@ INKError
parse_reply_list(int fd, char **list)
{
int ret, amount_read = 0;
- ink16 ret_val;
- ink32 list_size;
+ int16 ret_val;
+ int32 list_size;
INKError err_t;
if (!list)
@@ -1229,8 +1229,8 @@ INKError
parse_file_read_reply(int fd, int *ver, int *size, char **text)
{
int ret, amount_read = 0;
- ink32 f_size;
- ink16 ret_val, f_ver;
+ int32 f_size;
+ int16 ret_val, f_ver;
INKError err_t;
if (!ver || !size || !text)
@@ -1359,8 +1359,8 @@ INKError
parse_record_get_reply(int fd, INKRecordT * rec_type, void **rec_val)
{
int ret, amount_read = 0;
- ink16 ret_val, rec_t;
- ink32 rec_size;
+ int16 ret_val, rec_t;
+ int32 rec_size;
INKError err_t;
if (!rec_type || !rec_val)
@@ -1487,7 +1487,7 @@ INKError
parse_record_set_reply(int fd, INKActionNeedT * action_need)
{
int ret, amount_read = 0;
- ink16 ret_val, action_t;
+ int16 ret_val, action_t;
INKError err_t;
if (!action_need)
@@ -1559,7 +1559,7 @@ INKError
parse_proxy_state_get_reply(int fd, INKProxyStateT * state)
{
int ret, amount_read = 0;
- ink16 state_t;
+ int16 state_t;
if (!state)
return INK_ERR_PARAMS;
@@ -1608,7 +1608,7 @@ INKError
parse_event_active_reply(int fd, bool * is_active)
{
int ret, amount_read = 0;
- ink16 ret_val, active;
+ int16 ret_val, active;
INKError err_t;
if (!is_active)
@@ -1681,8 +1681,8 @@ parse_event_notification(int fd, INKEven
{
int amount_read, ret;
OpType msg_type;
- ink16 type_op;
- ink32 msg_len;
+ int16 type_op;
+ int32 msg_len;
char *event_name = NUL, *desc = NULL;
if (!event)
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli/CLI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLI.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli/CLI.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli/CLI.cc Wed May 19 21:06:35 2010
@@ -509,7 +509,7 @@ CLI_globals::QueryDeadhosts(char *largs,
int nread;
char response[MAX_BUF_READ_SIZE];
memset(response, 0, MAX_BUF_READ_SIZE);
- while ((nread = ink_read_socket(fd, response, MAX_BUF_READ_SIZE)) > 0) {
+ while ((nread = read_socket(fd, response, MAX_BUF_READ_SIZE)) > 0) {
output->copyFrom(response, nread);
if (nread < MAX_BUF_READ_SIZE)
break;
@@ -980,7 +980,7 @@ handleCLI(int cliFD, /* IN: U
} while (readResult == 1024);
if (readResult < 0 || input.spaceUsed() <= 0) {
- ink_close_socket(cliFD);
+ close_socket(cliFD);
return;
}
// parse command request from client
@@ -1088,15 +1088,15 @@ handleCLI(int cliFD, /* IN: U
// execute transition and associated actions
if (cliFSM.control(event, (void *) &cli_data) == FALSE) {
- ink_close_socket(cliFD);
+ close_socket(cliFD);
return;
}
// send response back to client
if (event != CL_EV_EXIT && (cli_write(cliFD, output.bufPtr(), output.spaceUsed()) < 0)) {
- ink_close_socket(cliFD);
+ close_socket(cliFD);
return;
} else if (CL_EV_EXIT == event) {
- ink_close_socket(cliFD);
+ close_socket(cliFD);
}
} // end while
@@ -1361,6 +1361,6 @@ handleOverseer(int fd, int mode)
mgmt_writeline(fd, ok, strlen(ok));
memset(buf, 0, 8192);
}
- ink_close_socket(fd);
+ close_socket(fd);
return;
}
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli/CliUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli/CliUtils.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli/CliUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli/CliUtils.cc Wed May 19 21:06:35 2010
@@ -57,7 +57,7 @@ cli_read(int fd, char *buf, int maxlen)
char c;
for (n = 1; n < maxlen; n++) {
- if ((rc = ink_read_socket(fd, &c, 1)) == 1) {
+ if ((rc = read_socket(fd, &c, 1)) == 1) {
*buf++ = c;
if (c == '\0') {
--buf;
@@ -94,7 +94,7 @@ cli_write(int fd, const char *data, int
nleft = nbytes;
while (nleft > 0) {
- nwritten = ink_write_socket(fd, tmp, nleft);
+ nwritten = write_socket(fd, tmp, nleft);
if (nwritten <= 0) /* Error or nothing written */
return nwritten;
@@ -102,7 +102,7 @@ cli_write(int fd, const char *data, int
tmp += nwritten;
}
- if ((n = ink_write_socket(fd, "\0", 1)) <= 0) { /* Terminating newline */
+ if ((n = write_socket(fd, "\0", 1)) <= 0) { /* Terminating newline */
if (n < 0)
return n;
else
@@ -189,7 +189,7 @@ cli_read_timeout(int fd, char *buf, int
}
ink_assert(bytesRead < maxlen);
- sys_r = ink_read_socket(fd, readCur, maxlen - bytesRead);
+ sys_r = read_socket(fd, readCur, maxlen - bytesRead);
if (sys_r < 0) {
fprintf(stderr, "Read from traffic_manager failed : %s\n", strerror(errno));
return -1;
@@ -283,7 +283,7 @@ cli_write_timeout(int fd, const char *da
return -1;
}
- sys_r = ink_write_socket(fd, requestCur, bytesToSend);
+ sys_r = write_socket(fd, requestCur, bytesToSend);
if (sys_r < 0) {
fprintf(stderr, "Write to traffic_manager failed, connection probably closed : %s\n", strerror(errno));
return -1;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli/clientCLI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli/clientCLI.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli/clientCLI.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli/clientCLI.cc Wed May 19 21:06:35 2010
@@ -104,7 +104,7 @@ clientCLI::setCliPort(int port)
clientCLI::CliResult clientCLI::disconnectFromLM(void)
{
- ink_close_socket(socketFD);
+ close_socket(socketFD);
socketFD = 0;
return err_none;
} // end disconnectFromLM()
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc Wed May 19 21:06:35 2010
@@ -5806,7 +5806,7 @@ ConfigRadiusKeys(const char *record)
time_t my_time_t;
time(&my_time_t);
memset(file_path, 0, 1024);
- snprintf(file_path, 1024, "%s%spwd_%lld.enc", dir_path, DIR_SEP, (ink64)my_time_t);
+ snprintf(file_path, 1024, "%s%spwd_%lld.enc", dir_path, DIR_SEP, (int64)my_time_t);
if (dir_path)
xfree(dir_path);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cluster/ClusterCom.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cluster/ClusterCom.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cluster/ClusterCom.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cluster/ClusterCom.cc Wed May 19 21:06:35 2010
@@ -201,7 +201,7 @@ drainIncomingChannel(void *arg)
// coverity[secure_coding]
if (sscanf(message, "aresolv: %d", &a) != 1) {
- ink_close_socket(req_fd);
+ close_socket(req_fd);
continue;
}
lmgmt->alarm_keeper->resolveAlarm(a);
@@ -214,7 +214,7 @@ drainIncomingChannel(void *arg)
char msg_ip[80];
const char *msg;
if (sscanf(message, "unmap: %79s", msg_ip) != 1) {
- ink_close_socket(req_fd);
+ close_socket(req_fd);
continue;
}
@@ -240,7 +240,7 @@ drainIncomingChannel(void *arg)
char msg_ip[80];
const char *msg;
if (sscanf(message, "map: %79s", msg_ip) != 1) {
- ink_close_socket(req_fd);
+ close_socket(req_fd);
continue;
}
@@ -277,7 +277,7 @@ drainIncomingChannel(void *arg)
/* Get the file and blast it back */
if (sscanf(message, "file: %1023s %d", fname, &ver) != 2) {
- ink_close_socket(req_fd);
+ close_socket(req_fd);
continue;
}
@@ -285,7 +285,7 @@ drainIncomingChannel(void *arg)
(rb->getCurrentVersion() == ver) && (rb->getVersion(ver, &buff) == OK_ROLLBACK)) {
size_t bytes_written = 0;
stat = true;
- bytes_written = ink_write_socket(req_fd, buff->bufPtr(), strlen(buff->bufPtr()));
+ bytes_written = write_socket(req_fd, buff->bufPtr(), strlen(buff->bufPtr()));
if (bytes_written != strlen(buff->bufPtr())) {
stat = false;
mgmt_log(stderr, "[drainIncomingChannel] Failed file req: %s v: %d\n", fname, ver);
@@ -321,12 +321,12 @@ drainIncomingChannel(void *arg)
} else if (!checkBackDoor(req_fd, message)) { /* Heh... */
mgmt_log("[ClusterCom::drainIncomingChannel] Unexpected message on cluster" " port. Possibly an attack\n");
Debug("ccom", "Unknown message to rsport received: %s", message);
- ink_close_socket(req_fd);
+ close_socket(req_fd);
continue;
}
}
}
- ink_close_socket(req_fd);
+ close_socket(req_fd);
}
}
return ret;
@@ -827,7 +827,7 @@ ClusterCom::handleMultiCastMessage(char
/* Their wall clock time and last config change time */
if ((line = ink_strtok_r(NULL, "\n", &last)) == NULL)
goto Lbogus;
- ink64 tt;
+ int64 tt;
if (sscanf(line, "time: %lld", &tt) != 1) {
mgmt_elog("[ClusterCom::handleMultiCastMessage] Invalid message-line(%d) '%s'\n", __LINE__, line);
return;
@@ -1137,7 +1137,7 @@ ClusterCom::handleMultiCastFilePacket(ch
char *line, file[1024];
version_t ver, our_ver;
time_t mod;
- ink64 tt;
+ int64 tt;
InkHashTableValue hash_value;
bool file_update_failure;
@@ -1455,7 +1455,7 @@ ClusterCom::constructSharedGenericPacket
/* Current time stamp, for xntp like synching */
if ((t = time(NULL)) > 0) {
- snprintf(tmp, sizeof(tmp), "time: %lld\n", (ink64)time(NULL));
+ snprintf(tmp, sizeof(tmp), "time: %lld\n", (int64)time(NULL));
ink_strncpy(&message[running_sum], tmp, (max - running_sum));
running_sum += strlen(tmp);
} else {
@@ -1478,7 +1478,7 @@ ClusterCom::constructSharedGenericPacket
the_records = &(lmgmt->record_data->node_data);
}
- snprintf(tmp, sizeof(tmp), "ctime: %lld\n", (ink64)lmgmt->record_data->time_last_config_change);
+ snprintf(tmp, sizeof(tmp), "ctime: %lld\n", (int64)lmgmt->record_data->time_last_config_change);
ink_strncpy(&message[running_sum], tmp, (max - running_sum));
running_sum += strlen(tmp);
ink_release_assert(running_sum < max);
@@ -1609,7 +1609,7 @@ ClusterCom::constructSharedFilePacket(ch
//time_t mod = rb->versionTimeStamp(ver);
time_t mod = 0;
- snprintf(tmp, sizeof(tmp), "%s %d %lld\n", line, ver, (ink64)mod);
+ snprintf(tmp, sizeof(tmp), "%s %d %lld\n", line, ver, (int64)mod);
ink_strncpy(&message[running_sum], tmp, (max - running_sum));
running_sum += strlen(tmp);
ink_release_assert(running_sum < max);
@@ -2002,16 +2002,16 @@ ClusterCom::rl_sendReliableMessage(unsig
if (connect(fd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) {
mgmt_elog("[ClusterCom::rl_sendReliableMessage] Unable to connect to peer\n");
- ink_close_socket(fd);
+ close_socket(fd);
return false;
}
if (mgmt_writeline(fd, buf, len) != 0) {
mgmt_elog(stderr, "[ClusterCom::rl_sendReliableMessage] Write failed\n");
- ink_close_socket(fd);
+ close_socket(fd);
return false;
}
- ink_close_socket(fd);
+ close_socket(fd);
return true;
} /* End ClusterCom::rl_sendReliableMessage */
@@ -2070,7 +2070,7 @@ ClusterCom::sendReliableMessage(unsigned
if (take_lock) {
ink_mutex_release(&mutex);
}
- ink_close_socket(fd);
+ close_socket(fd);
return false;
}
@@ -2079,7 +2079,7 @@ ClusterCom::sendReliableMessage(unsigned
if (take_lock) {
ink_mutex_release(&mutex);
}
- ink_close_socket(fd);
+ close_socket(fd);
return false;
}
@@ -2090,11 +2090,11 @@ ClusterCom::sendReliableMessage(unsigned
if (take_lock) {
ink_mutex_release(&mutex);
}
- ink_close_socket(fd);
+ close_socket(fd);
return false;
}
- ink_close_socket(fd);
+ close_socket(fd);
if (take_lock) {
ink_mutex_release(&mutex);
}
@@ -2146,21 +2146,21 @@ ClusterCom::sendReliableMessageReadTillC
if (connect(fd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) {
mgmt_elog("[ClusterCom::sendReliableMessageReadTillClose] Unable to connect\n");
ink_mutex_release(&mutex);
- ink_close_socket(fd);
+ close_socket(fd);
return false;
}
if (mgmt_writeline(fd, buf, len) != 0) {
mgmt_elog("[ClusterCom::sendReliableMessageReadTillClose] Write failed\n");
ink_mutex_release(&mutex);
- ink_close_socket(fd);
+ close_socket(fd);
return false;
} else {
Debug("ccom", "[ClusterCom::sendReliableMessageREadTillClose] Sent '%s' len: %d on fd: %d\n", buf, len, fd);
}
memset(tmp_reply, 0, 1024);
- while ((res = ink_read_socket(fd, tmp_reply, 1022) > 0)) {
+ while ((res = read_socket(fd, tmp_reply, 1022) > 0)) {
if (tmp_reply[0] == EOF) {
break;
}
@@ -2172,11 +2172,11 @@ ClusterCom::sendReliableMessageReadTillC
mgmt_elog("[ClusterCom::sendReliableMessageReadTillClose] Read failed\n");
perror("ClusterCom::sendReliableMessageReadTillClose");
ink_mutex_release(&mutex);
- ink_close_socket(fd);
+ close_socket(fd);
return false;
}
- ink_close_socket(fd);
+ close_socket(fd);
ink_mutex_release(&mutex);
return true;
} /* End ClusterCom::sendReliableMessageReadTillClose */
@@ -2415,7 +2415,7 @@ checkBackDoor(int req_fd, char *message)
case RECD_COUNTER:
case RECD_INT:
{
- ink64 val = (stype == RECD_COUNTER ? REC_readCounter(variable, &found) : REC_readInteger(variable, &found));
+ int64 val = (stype == RECD_COUNTER ? REC_readCounter(variable, &found) : REC_readInteger(variable, &found));
if (found) {
rep_len = snprintf(reply, sizeof(reply), "\nRecord '%s' Val: '%lld'\n", variable, val);
}
@@ -2510,7 +2510,7 @@ checkBackDoor(int req_fd, char *message)
snprintf(reply, sizeof(reply),
"Idle-Our-WC: %lld Peer-WC-Last-Time: %ld Delta: %ld Mgmt-Idle: %lld M-Alive: %d",
- (ink64)tmp->idle_ticks, tmp->last_time_recorded, tmp->delta, (ink64)tmp->manager_idle_ticks, tmp->manager_alive);
+ (int64)tmp->idle_ticks, tmp->last_time_recorded, tmp->delta, (int64)tmp->manager_idle_ticks, tmp->manager_alive);
mgmt_writeline(req_fd, reply, strlen(reply));
@@ -2530,7 +2530,7 @@ checkBackDoor(int req_fd, char *message)
snprintf(reply, sizeof(reply), "\tproxy_running: %s", (lmgmt->proxy_running ? "true" : "false"));
mgmt_writeline(req_fd, reply, strlen(reply));
- snprintf(reply, sizeof(reply), "\tproxy_started_at: %lld", (ink64)lmgmt->proxy_started_at);
+ snprintf(reply, sizeof(reply), "\tproxy_started_at: %lld", (int64)lmgmt->proxy_started_at);
mgmt_writeline(req_fd, reply, strlen(reply));
snprintf(reply, sizeof(reply), "\trun_proxy: %s", (lmgmt->run_proxy ? "true" : "false"));
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc Wed May 19 21:06:35 2010
@@ -909,7 +909,7 @@ open_socket(int port, const char *ip = N
error:
if (sock >= 0) {
- ink_close_socket(sock);
+ close_socket(sock);
}
#ifdef TRACE_LOG_COP
cop_log(COP_DEBUG, "Leaving open_socket(%d, %s, %s) --> %d\n", port, ip, ip_to_bind, -1);
@@ -919,9 +919,9 @@ error:
static int
test_port(int port, const char *request, char *buffer, int bufsize,
- ink64 test_timeout, char *ip = NULL, char *ip_to_bind = NULL)
+ int64 test_timeout, char *ip = NULL, char *ip_to_bind = NULL)
{
- ink64 start_time, timeout;
+ int64 start_time, timeout;
int sock;
size_t length = strlen(request);
int err, idx;
@@ -1004,7 +1004,7 @@ test_port(int port, const char *request,
error:
if (sock >= 0) {
- ink_close_socket(sock);
+ close_socket(sock);
}
return -1;
}
@@ -1226,7 +1226,7 @@ test_manager_http_port()
static int
heartbeat_manager()
{
- inku64 start;
+ uint64 start;
int err;
#ifdef TRACE_LOG_COP
@@ -1291,7 +1291,7 @@ heartbeat_server()
// are running in rni only mode
#ifndef RNI_ONLY
- inku64 start;
+ uint64 start;
int err;
#ifdef TRACE_LOG_COP
Modified: trafficserver/traffic/trunk/proxy/mgmt2/preparse/StoreReadConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/preparse/StoreReadConfig.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/preparse/StoreReadConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/preparse/StoreReadConfig.cc Wed May 19 21:06:35 2010
@@ -55,7 +55,7 @@ parseStorageFile(int fd)
char *e = strpbrk(n, " \t\n");
int len = e ? e - n : strlen(n);
(void) len;
- ink64 size = -1;
+ int64 size = -1;
while (*e && !isdigit(*e))
e++;
if (e && *e) {
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtServerRPC.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtServerRPC.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtServerRPC.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtServerRPC.cc Wed May 19 21:06:35 2010
@@ -67,7 +67,7 @@ raf_writen(int fd, const char *ptr, size
nleft = n;
while (nleft > 0) {
- if ((nwritten = ink_write_socket(fd, ptr, nleft)) <= 0) {
+ if ((nwritten = write_socket(fd, ptr, nleft)) <= 0) {
if (errno == EINTR)
nwritten = 0; /* and call write() again */
else
@@ -97,7 +97,7 @@ raf_readn(int fd, char *ptr, size_t n)
nleft = n;
while (nleft > 0) {
- if ((nread = ink_read_socket(fd, ptr, nleft)) < 0) {
+ if ((nread = read_socket(fd, ptr, nleft)) < 0) {
if (errno == EINTR)
nread = 0; /* and call read() again */
else
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtUtils.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtUtils.cc Wed May 19 21:06:35 2010
@@ -76,7 +76,7 @@ mgmt_readline(int soc, char *buf, int ma
for (n = 1; n < maxlen; n++) {
- if ((rc = ink_read_socket(soc, &c, 1)) == 1) {
+ if ((rc = read_socket(soc, &c, 1)) == 1) {
*buf++ = c;
if (c == '\n') {
@@ -121,7 +121,7 @@ mgmt_writeline(int soc, const char *data
nleft = nbytes;
while (nleft > 0) {
- nwritten = ink_write_socket(soc, tmp, nleft);
+ nwritten = write_socket(soc, tmp, nleft);
if (nwritten <= 0) { /* Error or nothing written */
return nwritten;
}
@@ -129,7 +129,7 @@ mgmt_writeline(int soc, const char *data
tmp += nwritten;
}
- if ((n = ink_write_socket(soc, "\n", 1)) <= 0) { /* Terminating newline */
+ if ((n = write_socket(soc, "\n", 1)) <= 0) { /* Terminating newline */
if (n < 0) {
return n;
} else {
@@ -158,7 +158,7 @@ mgmt_read_pipe(int fd, char *buf, int by
char *p = buf;
int bytes_read = 0;
while (bytes_to_read > 0) {
- err = ink_read_socket(fd, p, bytes_to_read);
+ err = read_socket(fd, p, bytes_to_read);
if (err == 0) {
return err;
} else if (err < 0) {
@@ -200,7 +200,7 @@ mgmt_write_pipe(int fd, char *buf, int b
char *p = buf;
int bytes_written = 0;
while (bytes_to_write > 0) {
- err = ink_write_socket(fd, p, bytes_to_write);
+ err = write_socket(fd, p, bytes_to_write);
if (err == 0) {
return err;
} else if (err < 0) {
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc Wed May 19 21:06:35 2010
@@ -668,7 +668,7 @@ MbytesFromLLong(RecLLong bytes, char *bu
void
bytesFromInt(RecInt bytes, char *bufVal)
{
- const ink64 gb = 1073741824;
+ const int64 gb = 1073741824;
const long int mb = 1048576;
const long int kb = 1024;
int bytesP;
@@ -705,7 +705,7 @@ bytesFromInt(RecInt bytes, char *bufVal)
void
bytesFromLLong(RecLLong bytes, char *bufVal)
{
- const ink64 gb = 1073741824;
+ const int64 gb = 1073741824;
const long int mb = 1048576;
const long int kb = 1024;
double unitBytes;
@@ -1535,7 +1535,7 @@ processSpawn(const char *args[],
} else if (pid == 0) { // child process
// close all the listening port in child process
for (int i = 0; i < MAX_PROXY_SERVER_PORTS && lmgmt->proxy_server_fd[i] >= 0; i++) {
- ink_close_socket(lmgmt->proxy_server_fd[i]);
+ close_socket(lmgmt->proxy_server_fd[i]);
}
// set uid to be the effective uid if it's run as root
if (run_as_root) {
@@ -1670,7 +1670,7 @@ getFilesInDirectory(char *managedDir, Ex
dirEntry = (struct dirent *) xmalloc(sizeof(struct dirent) + pathconf(".", _PC_NAME_MAX) + 1);
struct dirent *result;
- while (ink_readdir_r(dir, dirEntry, &result) == 0) {
+ while (readdir_r(dir, dirEntry, &result) == 0) {
if (!result)
break;
fileName = dirEntry->d_name;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtRaf.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtRaf.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtRaf.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtRaf.cc Wed May 19 21:06:35 2010
@@ -449,7 +449,7 @@ handleRaf(int fd)
}
- ink_close_socket(fd);
+ close_socket(fd);
}
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc Wed May 19 21:06:35 2010
@@ -488,7 +488,7 @@ encryptToFileAuth_malloc(const char *pas
time_t my_time_t;
time(&my_time_t);
memset(file_path, 0, MAX_TMP_BUF_LEN);
- snprintf(file_path, MAX_TMP_BUF_LEN, "%s%spwd_%lld.enc", dir_path, DIR_SEP, (ink64)my_time_t);
+ snprintf(file_path, MAX_TMP_BUF_LEN, "%s%spwd_%lld.enc", dir_path, DIR_SEP, (int64)my_time_t);
if (dir_path)
xfree(dir_path);
@@ -2616,7 +2616,7 @@ handle_submit_snapshot_to_floppy(WebHttp
// size
dirEntry = (struct dirent *) xmalloc(sizeof(struct dirent) + pathconf(".", _PC_NAME_MAX) + 1);
struct dirent *result;
- while (ink_readdir_r(dir, dirEntry, &result) == 0) {
+ while (readdir_r(dir, dirEntry, &result) == 0) {
if (!result)
break;
fileName = dirEntry->d_name;
@@ -3981,7 +3981,7 @@ read_request(WebHttpContext * whc)
if (ioctlsocket(whc->si.fd, FIONREAD, &i) != SOCKET_ERROR) {
if (i) {
char *buf = (char *) alloca(i * sizeof(char));
- ink_read_socket(whc->si.fd, buf, i);
+ read_socket(whc->si.fd, buf, i);
}
}
}
@@ -4388,7 +4388,7 @@ Ltransaction_send:
}
}
#endif
- ink_close_socket(whc->si.fd);
+ close_socket(whc->si.fd);
whc->si.fd = -1;
// log transaction
@@ -4408,7 +4408,7 @@ Ltransaction_close:
}
}
#endif
- ink_close_socket(whc->si.fd);
+ close_socket(whc->si.fd);
}
// clean up ssl
if (whc->server_state & WEB_HTTP_SERVER_STATE_SSL_ENABLED)
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpContext.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpContext.h?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpContext.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpContext.h Wed May 19 21:06:35 2010
@@ -43,8 +43,8 @@ struct WebHttpContext
{
WebHttpAuthUser current_user; // current user and access privileges
- inku32 request_state; // client request state
- inku32 server_state; // bit-mask of enabled server features
+ uint32 request_state; // client request state
+ uint32 server_state; // bit-mask of enabled server features
httpMessage *request; // client request
httpResponse *response_hdr; // server response headers
textBuffer *response_bdy; // server repsonse body
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc Wed May 19 21:06:35 2010
@@ -746,7 +746,7 @@ handle_summary_object(WebHttpContext * w
char *r = ink_ctime_r(&upTime, dateBuf);
if (r != NULL) {
HtmlRndrText(output, dict_ht, HTML_ID_UP_SINCE);
- snprintf(tmpBuf, sizeof(tmpBuf), ": %s (%lld:%02lld:%02lld:%02lld)", dateBuf, (ink64)d, (ink64)h, (ink64)m, (ink64)s);
+ snprintf(tmpBuf, sizeof(tmpBuf), ": %s (%lld:%02lld:%02lld:%02lld)", dateBuf, (int64)d, (int64)h, (int64)m, (int64)s);
output->copyFrom(tmpBuf, strlen(tmpBuf));
HtmlRndrBr(output);
}
@@ -1319,7 +1319,7 @@ handle_floppy_select(WebHttpContext * wh
HtmlRndrOptionClose(output);
struct dirent *result;
- while (ink_readdir_r(dir, dirEntry, &result) == 0) {
+ while (readdir_r(dir, dirEntry, &result) == 0) {
if (!result)
break;
fileName = dirEntry->d_name;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc Wed May 19 21:06:35 2010
@@ -404,19 +404,19 @@ newUNIXsocket(char *fpath)
if ((bind(socketFD, (struct sockaddr *) &serv_addr, servlen)) < 0) {
mgmt_log(stderr, "[newUNIXsocket] Unable to bind socket: %s\n", strerror(errno));
- ink_close_socket(socketFD);
+ close_socket(socketFD);
return -1;
}
if (chmod(fpath, 00755) < 0) {
mgmt_log(stderr, "[newUNIXsocket] Unable to chmod unix-domain socket: %s\n", strerror(errno));
- ink_close_socket(socketFD);
+ close_socket(socketFD);
return -1;
}
if ((listen(socketFD, 5)) < 0) {
mgmt_log(stderr, "[newUNIXsocket] Unable to listen on socket: %s", strerror(errno));
- ink_close_socket(socketFD);
+ close_socket(socketFD);
return -1;
}
// Set the close on exec flag so our children do not
@@ -464,13 +464,13 @@ newTcpSocket(int port)
// Bind the port to the socket
if (bind(socketFD, (sockaddr *) & socketInfo, sizeof(socketInfo)) < 0) {
mgmt_elog(stderr, "[newTcpSocket] Unable to bind port %d to socket: %s\n", port, strerror(errno));
- ink_close_socket(socketFD);
+ close_socket(socketFD);
return -1;
}
// Listen on the new socket
if (listen(socketFD, 5) < 0) {
mgmt_elog(stderr, "[newTcpSocket] %s\n", "Unable to listen on the socket");
- ink_close_socket(socketFD);
+ close_socket(socketFD);
return -1;
}
// Set the close on exec flag so our children do not
@@ -484,7 +484,7 @@ newTcpSocket(int port)
// Keep track of the number of service threads for debugging
// purposes
-static volatile ink32 numServiceThr = 0;
+static volatile int32 numServiceThr = 0;
void
printServiceThr(int sig)
@@ -559,7 +559,7 @@ serviceThrReaper(void *arg)
#else
ink_sem_post(&wGlobals.serviceThrCount);
#endif
- ink_atomic_increment((ink32 *) & numServiceThr, -1);
+ ink_atomic_increment((int32 *) & numServiceThr, -1);
wGlobals.serviceThrArray[i].alreadyShutdown = true;
Debug("ui", "%s %d %s %d\n", "Shuting Down Socket FD ",
@@ -576,7 +576,7 @@ serviceThrReaper(void *arg)
#else
ink_sem_post(&wGlobals.serviceThrCount);
#endif
- ink_atomic_increment((ink32 *) & numServiceThr, -1);
+ ink_atomic_increment((int32 *) & numServiceThr, -1);
}
usleep(300000);
@@ -1013,7 +1013,7 @@ webIntr_main(void *x)
#else
ink_sem_wait(&wGlobals.serviceThrCount);
#endif
- ink_atomic_increment((ink32 *) & numServiceThr, 1);
+ ink_atomic_increment((int32 *) & numServiceThr, 1);
// INKqa11624 - setup sockaddr struct for unix/tcp socket in different sizes
if (acceptFD == cliFD) {
@@ -1033,7 +1033,7 @@ webIntr_main(void *x)
#else
ink_sem_post(&wGlobals.serviceThrCount);
#endif
- ink_atomic_increment((ink32 *) & numServiceThr, -1);
+ ink_atomic_increment((int32 *) & numServiceThr, -1);
} else { // Accept succeeded
if (serviceThr == HTTP_THR) {
@@ -1083,9 +1083,9 @@ webIntr_main(void *x)
#else
ink_sem_post(&wGlobals.serviceThrCount);
#endif
- ink_atomic_increment((ink32 *) & numServiceThr, -1);
+ ink_atomic_increment((int32 *) & numServiceThr, -1);
xfree(clientInfo);
- ink_close_socket(clientFD);
+ close_socket(clientFD);
} else { // IP is allowed
for (i = 0; i < MAX_SERVICE_THREADS; i++) {
@@ -1107,13 +1107,13 @@ webIntr_main(void *x)
mgmt_elog(stderr, "[WebIntrMain] Failed to create service thread\n");
wGlobals.serviceThrArray[i].threadId = 0;
wGlobals.serviceThrArray[i].fd = -1;
- ink_close_socket(clientFD);
+ close_socket(clientFD);
#if (HOST_OS == darwin)
ink_sem_post(wGlobals.serviceThrCount);
#else
ink_sem_post(&wGlobals.serviceThrCount);
#endif
- ink_atomic_increment((ink32 *) & numServiceThr, -1);
+ ink_atomic_increment((int32 *) & numServiceThr, -1);
}
break;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.cc Wed May 19 21:06:35 2010
@@ -270,7 +270,7 @@ configAuthOtherUsers()
{
char fpath[FILE_NAME_MAX];
char *fbuf;
- ink64 fsize;
+ int64 fsize;
MgmtHashTable *ht;
InkHashTableEntry *hte;
InkHashTableIteratorState htis;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebUtils.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebUtils.cc Wed May 19 21:06:35 2010
@@ -84,7 +84,7 @@ UU_decode(const char *inBuffer, int outB
int inputBytesDecoded = 0;
// Figure out much encoded string is really there
- while (printableToSixBit[(inku8)inBuffer[inBytes]] <= MAX_PRINT_VAL) {
+ while (printableToSixBit[(uint8)inBuffer[inBytes]] <= MAX_PRINT_VAL) {
inBytes++;
}
@@ -133,7 +133,7 @@ socket_write(SocketInfo socketD, const c
#endif
} else {
- return ink_write_socket(socketD.fd, buf, nbyte);
+ return write_socket(socketD.fd, buf, nbyte);
}
return -1;
}
@@ -148,7 +148,7 @@ socket_read(SocketInfo socketD, char *bu
mgmt_fatal(stderr, "[socket_read] Attempt to use disabled SSL\n");
#endif
} else {
- return ink_read_socket(socketD.fd, buf, nbyte);
+ return read_socket(socketD.fd, buf, nbyte);
}
return -1;
}
Modified: trafficserver/traffic/trunk/proxy/signals.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/signals.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/signals.cc (original)
+++ trafficserver/traffic/trunk/proxy/signals.cc Wed May 19 21:06:35 2010
@@ -94,11 +94,11 @@ public:
snap = (char *) sbrk(0);
char *now = (char *) sbrk(0);
fprintf(stderr, "sbrk %llX from first %lld from last %lld\n",
- (inku64) ((int_pointer) now), (inku64) ((int_pointer) (now - end)),
- (inku64) ((int_pointer) (now - snap)));
+ (uint64) ((int_pointer) now), (uint64) ((int_pointer) (now - end)),
+ (uint64) ((int_pointer) (now - snap)));
#ifdef DEBUG
int fmdelta = fastmemtotal - fastmemsnap;
- fprintf(stderr, "fastmem %lld from last %lld\n", (ink64) fastmemtotal, (ink64) fmdelta);
+ fprintf(stderr, "fastmem %lld from last %lld\n", (int64) fastmemtotal, (int64) fmdelta);
fastmemsnap += fmdelta;
#endif
snap = now;
Modified: trafficserver/traffic/trunk/proxy/stats/CoupledStats.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/stats/CoupledStats.h?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/stats/CoupledStats.h (original)
+++ trafficserver/traffic/trunk/proxy/stats/CoupledStats.h Wed May 19 21:06:35 2010
@@ -90,7 +90,7 @@ private:
public:
CoupledStats(const char *name);
- StatDescriptor *CreateStat(const char *name, ink64 init_val);
+ StatDescriptor *CreateStat(const char *name, int64 init_val);
StatDescriptor *CreateStat(const char *name, float init_val);
};
@@ -136,7 +136,7 @@ CoupledStats::grow_check(StatDescriptor
}
CST_INLINE StatDescriptor *
-CoupledStats::CreateStat(const char *name, ink64 init_val)
+CoupledStats::CreateStat(const char *name, int64 init_val)
{
StatDescriptor *ret = NULL;
Modified: trafficserver/traffic/trunk/proxy/stats/Stats.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/stats/Stats.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/stats/Stats.cc (original)
+++ trafficserver/traffic/trunk/proxy/stats/Stats.cc Wed May 19 21:06:35 2010
@@ -87,7 +87,7 @@ RecData StatDescriptor::update_value()
}
StatDescriptor *
-StatDescriptor::CreateDescriptor(const char *prefix, char *name, size_t name_len, ink64 init_value)
+StatDescriptor::CreateDescriptor(const char *prefix, char *name, size_t name_len, int64 init_value)
{
char *t = name;
char tv[128];
@@ -139,7 +139,7 @@ StatDescriptor::CreateDescriptor(const c
}
StatDescriptor *
-StatDescriptor::CreateDescriptor(const char *name, ink64 init_value)
+StatDescriptor::CreateDescriptor(const char *name, int64 init_value)
{
int n_stat = ink_atomic_increment(&top_stat, 1);
RecDataT dt;
@@ -217,7 +217,7 @@ StatDescriptor::CreateDescriptor(const c
}
void
-StatDescriptor::set(ink64 val)
+StatDescriptor::set(int64 val)
{
if (m_magic == SHALLOW_COPY) {
ink_atomic_swap64(&m_value.rec_int, val);
@@ -249,7 +249,7 @@ StatDescriptor::set(float val)
}
void
-StatDescriptor::add(ink64 val)
+StatDescriptor::add(int64 val)
{
if (m_magic == SHALLOW_COPY) {
ink_atomic_increment64(&m_value.rec_int, val);
Modified: trafficserver/traffic/trunk/proxy/stats/Stats.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/stats/Stats.h?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/stats/Stats.h (original)
+++ trafficserver/traffic/trunk/proxy/stats/Stats.h Wed May 19 21:06:35 2010
@@ -65,11 +65,11 @@ private:
public:
- static StatDescriptor *CreateDescriptor(const char *category, char *name, size_t name_len, ink64 init_value);
+ static StatDescriptor *CreateDescriptor(const char *category, char *name, size_t name_len, int64 init_value);
static StatDescriptor *CreateDescriptor(const char *category, char *name, size_t name_len, float init_value);
- static StatDescriptor *CreateDescriptor(const char *name, ink64 init_value);
+ static StatDescriptor *CreateDescriptor(const char *name, int64 init_value);
static StatDescriptor *CreateDescriptor(const char *name, float init_value);
@@ -79,7 +79,7 @@ public:
{
return m_name;
}
- ink64 int_value() const;
+ int64 int_value() const;
float flt_value() const;
bool int_type() const
{
@@ -102,7 +102,7 @@ public:
void increment()
{
if (m_type == RECD_INT)
- add((ink64) 1);
+ add((int64) 1);
else
add((float) 1.0);
}
@@ -110,12 +110,12 @@ public:
void decrement()
{
if (m_type == RECD_INT)
- add((ink64) - 1);
+ add((int64) - 1);
else
add((float) -1.0);
}
- void subtract(ink64 val)
+ void subtract(int64 val)
{
add(-val);
}
@@ -123,9 +123,9 @@ public:
{
add(-val);
}
- void set(ink64 val);
+ void set(int64 val);
void set(float val);
- void add(ink64 val);
+ void add(int64 val);
void add(float val);
void commit();
@@ -192,7 +192,7 @@ StatDescriptor::operator=(const StatDesc
return *this;
}
-ST_INLINE ink64
+ST_INLINE int64
StatDescriptor::int_value() const
{
if (m_magic == NULL_VALUE || m_magic == IN_ERROR) {
@@ -205,7 +205,7 @@ StatDescriptor::int_value() const
RecData tmp = (m_magic == SHALLOW_COPY)
? m_value : const_cast<StatDescriptor *>(this)->update_value();
- return m_type == RECD_INT ? tmp.rec_int : (ink64) tmp.rec_float;
+ return m_type == RECD_INT ? tmp.rec_int : (int64) tmp.rec_float;
}
ST_INLINE float
Modified: trafficserver/traffic/trunk/test/deft/proc_manager.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/deft/proc_manager.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/test/deft/proc_manager.cc (original)
+++ trafficserver/traffic/trunk/test/deft/proc_manager.cc Wed May 19 21:06:35 2010
@@ -1228,12 +1228,12 @@ NetCmdHandler::process_stat_file_cmd(Raf
reply(1) = strdup("0");
reply(2) = strdup("size");
- snprintf(num_buf, 63, "%lld", (ink64) stat_info.st_size);
+ snprintf(num_buf, 63, "%lld", (int64) stat_info.st_size);
num_buf[63] = '\0';
reply(3) = strdup(num_buf);
reply(4) = strdup("mod_date");
- snprintf(num_buf, 63, "%b32d", (inku32) stat_info.st_mtime);
+ snprintf(num_buf, 63, "%b32d", (uint32) stat_info.st_mtime);
num_buf[63] = '\0';
reply(5) = strdup(num_buf);