From b386f0c5d35994a54e95d5fe1c4bcbfd1cdea59c Mon Sep 17 00:00:00 2001 From: Fu Juntang <StrongTiger_001@163.com> Date: 星期五, 03 九月 2021 17:43:11 +0800 Subject: [PATCH] Supplementary for the fix of the lock removal. --- src/bh_api.cpp | 426 ++++++++++++++++++++++++++++++++-------------------- 1 files changed, 263 insertions(+), 163 deletions(-) diff --git a/src/bh_api.cpp b/src/bh_api.cpp index 76e78d7..e36daee 100644 --- a/src/bh_api.cpp +++ b/src/bh_api.cpp @@ -10,8 +10,8 @@ #include "bhome_msg_api.pb.h" #include "bhome_msg.pb.h" #include "error_msg.pb.h" -#include "proto/bhome_msg.pb.h" -#include "proto/bhome_msg_api.pb.h" +#include "../proto/source/bhome_msg.pb.h" +#include "../proto/source/bhome_msg_api.pb.h" static Logger *logger = LoggerFactory::getLogger(); @@ -277,11 +277,11 @@ int BHRegisterTopics(const void *topics, const int topics_len, void **reply, int *reply_len, const int timeout_ms) { int rv; - int min, i; + int len, i; void *buf = NULL; int total = 0; int count = 0; - char topics_buf[MAX_STR_LEN * MAX_TOPICS_NUN] = { 0x00 }; + char *topics_buf = NULL; #if defined(PRO_DE_SERIALIZE) struct _MsgTopicList @@ -308,6 +308,8 @@ for(int i = 0; i < _input.amount; i++) { _input.topics[i] = input.topic_list(i).c_str(); + + total += strlen(_input.topics[i]) + 1; } #else if ((topics == NULL) || (topics_len == 0)) { @@ -319,6 +321,8 @@ goto exit_entry; } + + total = topics_len; #endif if (gRun_stat == 0) { @@ -333,38 +337,48 @@ rv = pthread_mutex_trylock(&mutex); if (rv == 0) { + + topics_buf = (char *)malloc(total); + if (topics_buf == NULL) { + + rv = EBUS_NO_MEM; + memset(errString, 0x00, sizeof(errString)); + strncpy(errString, bus_strerror(rv), sizeof(errString)); + + logger->error("in BHRegisterTopics: Out of memory!\n"); + + pthread_mutex_unlock(&mutex); + + goto exit_entry; + } + memset(topics_buf, 0x00, total); + #if defined(PRO_DE_SERIALIZE) - total = sizeof(topics_buf) / sizeof(char); for (i = 0; i < _input.amount; i++) { - min = (strlen(_input.topics[i]) > (total - 1) ? (total - 1) : strlen(_input.topics[i])); - if (min > 0) { - strncpy(topics_buf + count, _input.topics[i], min); - count += min; + + len = strlen(_input.topics[i]); + strncpy(topics_buf + count, _input.topics[i], len); + + count += len; - if (total >= strlen(_input.topics[i])) { - total -= strlen(_input.topics[i]); - } - - if ((_input.amount > 1) && (i < (_input.amount - 1))) { - strncpy(topics_buf + count, STR_MAGIC, strlen(STR_MAGIC)); - total -= 1; - count++; - } - } else { - topics_buf[strlen(topics_buf) - 1] = '\0'; + if ((_input.amount > 1) && (i < (_input.amount - 1))) { + strncpy(topics_buf + count, STR_MAGIC, strlen(STR_MAGIC)); + + count++; } } - - logger->debug("the parsed compound register topics: %s!\n", topics_buf); + #else - memcpy(topics_buf, topics, topics_len > (sizeof(topics_buf) - 1) ? (sizeof(topics_buf) - 1) : topics_len); + memcpy(topics_buf, topics, topics_len); + count = topics_len; #endif - rv = net_mod_socket_reg(gNetmod_socket, topics_buf, strlen(topics_buf) + 1, NULL, 0, timeout_ms, PROC_REG_TCS); + rv = net_mod_socket_reg(gNetmod_socket, topics_buf, count, NULL, 0, timeout_ms, PROC_REG_TCS); memset(errString, 0x00, sizeof(errString)); strncpy(errString, bus_strerror(rv), sizeof(errString)); - + + free(topics_buf); pthread_mutex_unlock(&mutex); } else { @@ -382,13 +396,13 @@ *reply = malloc(*reply_len); mcr.SerializePartialToArray(*reply, *reply_len); #else - min = strlen(errString) + 1; - buf = malloc(min) ; + len = strlen(errString) + 1; + buf = malloc(len) ; memcpy(buf, errString, strlen(errString)); - *((char *)buf + min - 1) = '\0'; + *((char *)buf + len - 1) = '\0'; *reply = buf; - *reply_len = min; + *reply_len = len; #endif if (rv == 0) @@ -406,7 +420,7 @@ char topics_buf[MAX_STR_LEN] = { 0x00 }; ProcInfo_query *ptr = NULL; ProcInfo *Proc_ptr = NULL; - + #if defined(PRO_DE_SERIALIZE) struct _BHAddress { @@ -467,7 +481,7 @@ buf = const_cast<void *>(topic); strncpy(topics_buf, (const char *)buf, min); #endif - rv = net_mod_socket_reg(gNetmod_socket, topics_buf, strlen(topics_buf) + 1, &buf, &size, timeout_ms, PROC_QUE_TCS); + rv = net_mod_socket_reg(gNetmod_socket, topics_buf, min, &buf, &size, timeout_ms, PROC_QUE_TCS); memset(errString, 0x00, sizeof(errString)); strncpy(errString, bus_strerror(rv), sizeof(errString)); @@ -506,9 +520,9 @@ for(int i = 0; i < mtr_list_num; i++) { mtr_list[i].proc_id = ptr->procData.proc_id; - mtr_list[i].mq_id = 0x00; - mtr_list[i].abs_addr = 0x00; - mtr_list[i].ip = "192.168.1.1"; + mtr_list[i].mq_id = ID_RSV; + mtr_list[i].abs_addr = ABS_ID_RSV; + mtr_list[i].ip = "127.0.0.1"; mtr_list[i].port = 5000; } } @@ -687,7 +701,7 @@ *reply_len = mpr.ByteSizeLong(); *reply = malloc(*reply_len); - mpr.SerializePartialToArray(*reply,*reply_len); + mpr.SerializePartialToArray(*reply, *reply_len); } #else if (rv == 0) { @@ -717,9 +731,9 @@ int sec, nsec; int total = 0; int count = 0; - int min, i; + int len, i; void *buf = NULL; - char topics_buf[MAX_STR_LEN * MAX_TOPICS_NUN] = { 0x00 }; + char *topics_buf = NULL; #if defined(PRO_DE_SERIALIZE) struct _MsgTopicList @@ -744,8 +758,11 @@ _input.amount = MAX_STR_LEN; } - for(int i = 0; i < _input.amount; i++) + for(int i = 0; i < _input.amount; i++) { _input.topics[i] = input.topic_list(i).c_str(); + + total += strlen(_input.topics[i]) + 1; + } #else if ((topics == NULL) || (topics_len == 0)) { @@ -769,51 +786,61 @@ rv = pthread_mutex_trylock(&mutex); if (rv == 0) { -#if defined(PRO_DE_SERIALIZE) - total = sizeof(topics_buf) / sizeof(char); - for (i = 0; i < _input.amount; i++) { - min = (strlen(_input.topics[i]) > (total - 1) ? (total - 1) : strlen(_input.topics[i])); - if (min > 0) { - strncpy(topics_buf + count, _input.topics[i], min); - count += min; - if (total >= strlen(_input.topics[i])) { - total -= strlen(_input.topics[i]); - } + topics_buf = (char *)malloc(total); + if (topics_buf == NULL) { + + rv = EBUS_NO_MEM; + memset(errString, 0x00, sizeof(errString)); + strncpy(errString, bus_strerror(rv), sizeof(errString)); + + logger->error("in BHSubscribeTopics: Out of memory!\n"); + + pthread_mutex_unlock(&mutex); - if ((_input.amount > 1) && (i < (_input.amount - 1))) { - strncpy(topics_buf + count, STR_MAGIC, strlen(STR_MAGIC)); - total -= 1; - count++; - } - } else { - topics_buf[strlen(topics_buf) - 1] = '\0'; - } + goto exit_entry; } - logger->debug("the parsed compound sub topics: %s!\n", topics_buf); + memset(topics_buf, 0x00, total); + +#if defined(PRO_DE_SERIALIZE) + for (i = 0; i < _input.amount; i++) { + len = strlen(_input.topics[i]); + strncpy(topics_buf + count, _input.topics[i], len); + + count += len; + + if ((_input.amount > 1) && (i < (_input.amount - 1))) { + strncpy(topics_buf + count, STR_MAGIC, strlen(STR_MAGIC)); + + count++; + } + } + #else - memcpy(topics_buf, topics, topics_len > (sizeof(topics_buf) - 1) ? (sizeof(topics_buf) - 1) : topics_len); + memcpy(topics_buf, topics, topics_len); + count = topics_len; #endif if (timeout_ms > 0) { sec = timeout_ms / 1000; nsec = (timeout_ms - sec * 1000) * 1000 * 1000; - rv = net_mod_socket_sub_timeout(gNetmod_socket, topics_buf, strlen(topics_buf) + 1, sec, nsec); + rv = net_mod_socket_sub_timeout(gNetmod_socket, topics_buf, count, sec, nsec); } else if (timeout_ms == 0) { - rv = net_mod_socket_sub_nowait(gNetmod_socket, topics_buf, strlen(topics_buf) + 1); + rv = net_mod_socket_sub_nowait(gNetmod_socket, topics_buf, count); } else { - rv = net_mod_socket_sub(gNetmod_socket, topics_buf, strlen(topics_buf) + 1); + rv = net_mod_socket_sub(gNetmod_socket, topics_buf, count); } memset(errString, 0x00, sizeof(errString)); strncpy(errString, bus_strerror(rv), sizeof(errString)); + free(topics_buf); pthread_mutex_unlock(&mutex); } else { @@ -832,13 +859,13 @@ *reply=malloc(*reply_len); mcr.SerializePartialToArray(*reply,*reply_len); #else - min = strlen(errString) + 1; - buf = malloc(min) ; + len = strlen(errString) + 1; + buf = malloc(len) ; memcpy(buf, errString, strlen(errString)); - *((char *)buf + min - 1) = '\0'; + *((char *)buf + len - 1) = '\0'; *reply = buf; - *reply_len = min; + *reply_len = len; #endif if (rv == 0) @@ -906,7 +933,7 @@ } #if defined(PRO_DE_SERIALIZE) -int BHPublish(const char *msgpub, const char msgpub_len, const int timeout_ms) +int BHPublish(const void *msgpub, const int msgpub_len, const int timeout_ms) #else int BHPublish(const char *topic, const char *content, const int timeout_ms) #endif @@ -918,7 +945,7 @@ int node_arr_len = 0; #if defined(PRO_DE_SERIALIZE) - struct _MsgPublish + struct MsgPublish { const char *topic; const char *data; @@ -1098,8 +1125,6 @@ #endif - pthread_mutex_unlock(&mutex); - } else { memset(errString, 0x00, sizeof(errString)); @@ -1123,7 +1148,8 @@ int sec, nsec; std::string MsgID; int timeout_ms = 3000; - char topics_buf[MAX_STR_LEN * MAX_TOPICS_NUN] = { 0x00 }; + char buf_temp[MAX_STR_LEN] = { 0x00 }; + char *topics_buf = NULL; #if defined(PRO_DE_SERIALIZE) struct _BHAddress @@ -1182,12 +1208,12 @@ rv = pthread_mutex_trylock(&mutex); if (rv == 0) { #if defined(PRO_DE_SERIALIZE) - strncpy(topics_buf, _input1.topic, (sizeof(topics_buf) - 1) > strlen(_input1.topic) ? strlen(_input1.topic) : (sizeof(topics_buf) - 1)); + strncpy(buf_temp, _input1.topic, (sizeof(buf_temp) - 1) > strlen(_input1.topic) ? strlen(_input1.topic) : (sizeof(buf_temp) - 1)); #else - strncpy(topics_buf, (char *)request, (sizeof(topics_buf) - 1) > strlen((char *)request) ? strlen((char *)request) : (sizeof(topics_buf) - 1)); + strncpy(buf_temp, (char *)request, (sizeof(buf_temp) - 1) > strlen((char *)request) ? strlen((char *)request) : (sizeof(buf_temp) - 1)); #endif - rv = net_mod_socket_reg(gNetmod_socket, topics_buf, strlen(topics_buf), &buf, &size, timeout_ms, PROC_QUE_STCS); + rv = net_mod_socket_reg(gNetmod_socket, buf_temp, strlen(buf_temp), &buf, &size, timeout_ms, PROC_QUE_STCS); if (rv == 0) { val = atoi((char *)buf); @@ -1196,12 +1222,31 @@ if (val > 0) { - len = strlen(topics_buf); + len = strlen(buf_temp) + 1; #if defined(PRO_DE_SERIALIZE) - min = (sizeof(topics_buf) - 1 - len ) > strlen(_input1.data) ? strlen(_input1.data) : (sizeof(topics_buf) - 1 - len ); - strncpy(topics_buf + len + 1, _input1.data, min); - len += (min + 1); + len += strlen(_input1.data); #endif + + topics_buf = (char *)malloc(len); + if (topics_buf == NULL) { + + rv = EBUS_NO_MEM; + memset(errString, 0x00, sizeof(errString)); + strncpy(errString, bus_strerror(rv), sizeof(errString)); + + logger->error("in BHRequest: Out of memory!\n"); + + pthread_mutex_unlock(&mutex); + + return false; + } + memset(topics_buf, 0x00, len); + + strncpy(topics_buf, buf_temp, strlen(buf_temp) + 1); +#if defined(PRO_DE_SERIALIZE) + strncpy(topics_buf + strlen(buf_temp) + 1, _input1.data, strlen(_input1.data)); +#endif + if (timeout_ms > 0) { sec = timeout_ms / 1000; @@ -1216,7 +1261,10 @@ } else { rv = net_mod_socket_sendto(gNetmod_socket, topics_buf, len, val); - } + } + + free(topics_buf); + } else { rv = EBUS_RES_UNSUPPORT; @@ -1272,9 +1320,15 @@ net_mod_recv_msg_t *recv_arr; net_mod_err_t *errarr; int errarr_size = 0; - int sec, nsec; - char topics_buf[MAX_STR_LEN] = { 0x00 }; + char buf_temp[MAX_STR_LEN] = { 0x00 }; + char *topics_buf = NULL; + struct _RequestReply + { + std::string proc_id; + std::string data; + }rr; + #if defined(PRO_DE_SERIALIZE) struct _BHAddress { @@ -1289,7 +1343,7 @@ const char *topic; const char *data; }_input1; - + ::bhome_msg::BHAddress input0; ::bhome_msg::MsgRequestTopic input1; if (!input0.ParseFromArray(remote, remote_len) || !input1.ParseFromArray(request, request_len)) { @@ -1332,37 +1386,68 @@ rv = pthread_mutex_trylock(&mutex); if (rv == 0) { #if defined(PRO_DE_SERIALIZE) - strncpy(topics_buf, _input1.topic, (sizeof(topics_buf) - 1) > strlen(_input1.topic) ? strlen(_input1.topic) : (sizeof(topics_buf) - 1)); + strncpy(buf_temp, _input1.topic, (sizeof(buf_temp) - 1) > strlen(_input1.topic) ? strlen(_input1.topic) : (sizeof(buf_temp) - 1)); #else - strncpy(topics_buf, (char *)request, (sizeof(topics_buf) - 1) > request_len ? request_len : (sizeof(topics_buf) - 1)); + strncpy(buf_temp, (char *)request, (sizeof(buf_temp) - 1) > request_len ? request_len : (sizeof(buf_temp) - 1)); #endif - rv = net_mod_socket_reg(gNetmod_socket, topics_buf, strlen(topics_buf), &buf, &size, timeout_ms, PROC_QUE_STCS); + rv = net_mod_socket_reg(gNetmod_socket, buf_temp, strlen(buf_temp), &buf, &size, timeout_ms, PROC_QUE_STCS); if (rv == 0) { + val = atoi((char *)buf); free(buf); if (val > 0) { memset(&node, 0x00, sizeof(node)); - - len = strlen(topics_buf); + + len = strlen(buf_temp) + 1; #if defined(PRO_DE_SERIALIZE) - min = (sizeof(topics_buf) - 1 - len ) > strlen(_input1.data) ? strlen(_input1.data) : (sizeof(topics_buf) - 1 - len ); - strncpy(topics_buf + len + 1, _input1.data, min); - len += (min + 1); + len += strlen(_input1.data); #endif + topics_buf = (char *)malloc(len); + if (topics_buf == NULL) { + + rv = EBUS_NO_MEM; + memset(errString, 0x00, sizeof(errString)); + strncpy(errString, bus_strerror(rv), sizeof(errString)); + + logger->error("in BHRequest: Out of memory!\n"); + + pthread_mutex_unlock(&mutex); + + return false; + } + memset(topics_buf, 0x00, len); + + strncpy(topics_buf, buf_temp, strlen(buf_temp) + 1); +#if defined(PRO_DE_SERIALIZE) + strncpy(topics_buf + strlen(buf_temp) + 1, _input1.data, strlen(_input1.data)); +#endif + node.key = val; - rv = net_mod_socket_sendandrecv(gNetmod_socket, &node, 1, topics_buf, len, &recv_arr, &recv_arr_size, &errarr, &errarr_size); + + if (timeout_ms > 0) { + + rv = net_mod_socket_sendandrecv_timeout(gNetmod_socket, &node, 1, topics_buf, len, &recv_arr, &recv_arr_size, &errarr, &errarr_size, timeout_ms); + + } else if (timeout_ms == 0) { + + rv = net_mod_socket_sendandrecv_nowait(gNetmod_socket, &node, 1, topics_buf, len, &recv_arr, &recv_arr_size, &errarr, &errarr_size); + + } else { + + rv = net_mod_socket_sendandrecv(gNetmod_socket, &node, 1, topics_buf, len, &recv_arr, &recv_arr_size, &errarr, &errarr_size); + } if (rv > 0) { if (recv_arr_size > 0) { node.key = recv_arr[0].key; - - memset(topics_buf, 0x00, sizeof(topics_buf)); + size = recv_arr[0].content_length; buf = (char *)malloc(size); + memset(buf, 0x00, size); strncpy((char *)buf, (char *)recv_arr[0].content, size); #if !defined(PRO_DE_SERIALIZE) *reply = buf; @@ -1381,33 +1466,29 @@ } else { rv = EBUS_TIMEOUT; } - + } else { rv = EBUS_RES_UNSUPPORT; } + + free(topics_buf); } memset(errString, 0x00, sizeof(errString)); strncpy(errString, bus_strerror(rv), sizeof(errString)); - - struct _RequestReply - { - std::string proc_id; - std::string data; - }rr; if (rv == 0) { - memset(topics_buf, 0x00, sizeof(topics_buf)); - sprintf(topics_buf, "%d", node.key); + memset(buf_temp, 0x00, sizeof(buf_temp)); + sprintf(buf_temp, "%d", node.key); - rr.proc_id = topics_buf; + rr.proc_id = buf_temp; *proc_id_len = rr.proc_id.size(); *proc_id = malloc(*proc_id_len); memcpy(*proc_id, rr.proc_id.data(), *proc_id_len); - memset(topics_buf, 0x00, sizeof(topics_buf)); - memcpy(topics_buf, buf, size); - rr.data = topics_buf; + memset(buf_temp, 0x00, sizeof(buf_temp)); + memcpy(buf_temp, buf, size); + rr.data = buf_temp; } pthread_mutex_unlock(&mutex); @@ -1451,8 +1532,10 @@ void *buf; int key; int size; + int len; int sec, nsec; - char topics_buf[MAX_STR_LEN] = { 0x00 }; + char buf_temp[MAX_STR_LEN] = { 0x00 }; + char *topics_buf = NULL; if (gRun_stat == 0) { logger->error("the process has not been registered yet!\n"); @@ -1464,73 +1547,87 @@ return false; } - rv = pthread_mutex_trylock(&mutex); + if (timeout_ms > 0) { + + sec = timeout_ms / 1000; + nsec = (timeout_ms - sec * 1000) * 1000 * 1000; + + rv = net_mod_socket_recvfrom_timeout(gNetmod_socket, &buf, &size, &key, sec, nsec); + + } else if (timeout_ms == 0) { + + rv = net_mod_socket_recvfrom_nowait(gNetmod_socket, &buf, &size, &key); + + } else { + + rv = net_mod_socket_recvfrom(gNetmod_socket, &buf, &size, &key); + } + if (rv == 0) { - if (timeout_ms > 0) { + struct _ReadRequestReply + { + std::string proc_id; + std::string topic; + std::string data; + void *src; + } rrr; - sec = timeout_ms / 1000; - nsec = (timeout_ms - sec * 1000) * 1000 * 1000; + sprintf(buf_temp, "%d", key); + rrr.proc_id = buf_temp; - rv = net_mod_socket_recvfrom_timeout(gNetmod_socket, &buf, &size, &key, sec, nsec); + *proc_id_len = rrr.proc_id.size(); + *proc_id = malloc(*proc_id_len); + memcpy(*proc_id, rrr.proc_id.data(), *proc_id_len); - } else if (timeout_ms == 0) { - - rv = net_mod_socket_recvfrom_nowait(gNetmod_socket, &buf, &size, &key); + topics_buf = (char *)malloc(size + MIN_STR_LEN); + if (topics_buf == NULL) { + + rv = EBUS_NO_MEM; + memset(errString, 0x00, sizeof(errString)); + strncpy(errString, bus_strerror(rv), sizeof(errString)); + + logger->error("in BHReadRequest: Out of memory!\n"); + + return false; + } + memset(topics_buf, 0x00, size + MIN_STR_LEN); - } else { - - rv = net_mod_socket_recvfrom(gNetmod_socket, &buf, &size, &key); + len = strlen((char *)buf); + if (len > size) { + len = size; + } + strncpy(topics_buf, (char *)buf, len); + rrr.topic = topics_buf; + + if (len < size) { + strncpy(topics_buf + len + 1, (char *)buf + len + 1, size - len - 1); } - if (rv == 0) { - struct _ReadRequestReply - { - std::string proc_id; - std::string topic; - std::string data; - void *src; - } rrr; - - sprintf(topics_buf, "%d", key); - rrr.proc_id = topics_buf; - - *proc_id_len = rrr.proc_id.size(); - *proc_id = malloc(*proc_id_len); - memcpy(*proc_id, rrr.proc_id.data(), *proc_id_len); - - memset(topics_buf, 0x00, sizeof(topics_buf)); - memcpy(topics_buf, buf, size > sizeof(topics_buf) ? sizeof(topics_buf) : size); - rrr.topic = topics_buf; - rrr.data = topics_buf; + rrr.data = topics_buf + len + 1; + + free(topics_buf); #if defined(PRO_DE_SERIALIZE) - ::bhome_msg::MsgRequestTopic mrt; - mrt.set_topic(rrr.topic); - mrt.set_data(rrr.data.data()); - *request_len = mrt.ByteSizeLong(); - *request = malloc(*request_len); - mrt.SerializePartialToArray(*request,*request_len); + ::bhome_msg::MsgRequestTopic mrt; + mrt.set_topic(rrr.topic); + mrt.set_data(rrr.data.data()); + *request_len = mrt.ByteSizeLong(); + *request = malloc(*request_len); + mrt.SerializePartialToArray(*request,*request_len); #else - *request = buf; - *request_len = size; + *request = buf; + *request_len = size; #endif - buf = malloc(sizeof(int)); - *(int *)buf = key; - *src = buf; - } + free(buf); - pthread_mutex_unlock(&mutex); - - memset(errString, 0x00, sizeof(errString)); - strncpy(errString, bus_strerror(rv), sizeof(errString)); - - } else { - - rv = EBUS_RES_BUSY; - memset(errString, 0x00, sizeof(errString)); - strncpy(errString, bus_strerror(rv), sizeof(errString)); + buf = malloc(sizeof(int)); + *(int *)buf = key; + *src = buf; } + + memset(errString, 0x00, sizeof(errString)); + strncpy(errString, bus_strerror(rv), sizeof(errString)); if (rv == 0) return true; @@ -1541,7 +1638,8 @@ int BHSendReply(void *src, const void *reply, const int reply_len) { int rv; - + const char *_input; + #if defined(PRO_DE_SERIALIZE) ::bhome_msg::MsgRequestTopicReply input; if (!input.ParseFromArray(reply, reply_len)) { @@ -1553,9 +1651,8 @@ return false; } - const char *_input; _input = input.data().data(); - + #else if ((src == NULL) || (reply == NULL) || (reply_len == 0)) { @@ -1565,6 +1662,9 @@ return false; } + + _input = (char *)reply; + #endif if (gRun_stat == 0) { @@ -1580,7 +1680,7 @@ rv = pthread_mutex_trylock(&mutex); if (rv == 0) { - rv = net_mod_socket_sendto(gNetmod_socket, reply, reply_len, *(int *)src); + rv = net_mod_socket_sendto(gNetmod_socket, _input, strlen(_input), *(int *)src); memset(errString, 0x00, sizeof(errString)); strncpy(errString, bus_strerror(rv), sizeof(errString)); -- Gitblit v1.8.0