diff options
| author | lishu <[email protected]> | 2018-12-10 15:06:55 +0800 |
|---|---|---|
| committer | lishu <[email protected]> | 2018-12-10 15:06:55 +0800 |
| commit | 6fe3adca2b7ec88c11bb581c8a7fe5449e963d10 (patch) | |
| tree | 87e529818919a0b0c37b48b3d54ff148432195aa /src/message.c | |
| parent | 1665395160274983bc16d7abaa23ea4a48fc4624 (diff) | |
1.修复UNIXsocket初始化导致日志报错的bug
2.将K_PROJECT的宏定义设置在makefile
3.功能修改：粗拼装接收建议的端口与发给前端的接口可以不一样
4.整理support目录
Diffstat (limited to 'src/message.c')
| -rw-r--r-- | src/message.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/message.c b/src/message.c index f3a1a07..5562d61 100644 --- a/src/message.c +++ b/src/message.c @@ -901,7 +901,7 @@ long resp_checkresult_search_media_cb(void *data, const uint8_t *key, uint size, inet_ntop(AF_INET, &ip, pbuf, buf_len);
resp_write_to_log(RESP_SEND_BLOCK, check_res, pbuf, mdi, mdi->qd_info[i].mid);
*(uint64_t*)check_res->prog_id = mdi->qd_info[i].mid;
- bizman_send(g_frag_run.answer_sapp_bizman, mdi->thread_seq, ip, g_frag_cfg.msg_port, (const char*)buf, buflen,
+ bizman_send(g_frag_run.answer_sapp_bizman, mdi->thread_seq, ip, g_frag_cfg.qd_msg_port, (const char*)buf, buflen,
1,BIZMAN_RELIABLE_SEND|BIZMAN_SMOOTH_DEST|BIZMAN_PUSH_SEND);
g_frag_stat.stat_info[RESP_CHECKRESULT_BLACKLIST_OUT_BLOCK][TOTAL_PKTS]++;
g_frag_stat.stat_info[RESP_CHECKRESULT_BLACKLIST_OUT_BLOCK][TOTAL_BYTES] += buflen;
@@ -918,7 +918,7 @@ long resp_checkresult_search_media_cb(void *data, const uint8_t *key, uint size, inet_ntop(AF_INET, &ip, pbuf, buf_len);
resp_write_to_log(RESP_SEND_BLOCK_MULTI, check_res, pbuf, mdi, mdi->qd_info_from_cpz[i].mid);
*(uint64_t*)check_res->prog_id = mdi->qd_info_from_cpz[i].mid;
- bizman_send(g_frag_run.answer_sapp_bizman, mdi->thread_seq, ip, g_frag_cfg.msg_port, (const char*)buf, buflen,
+ bizman_send(g_frag_run.answer_sapp_bizman, mdi->thread_seq, ip, g_frag_cfg.qd_msg_port, (const char*)buf, buflen,
1,BIZMAN_RELIABLE_SEND|BIZMAN_SMOOTH_DEST|BIZMAN_PUSH_SEND);
g_frag_stat.stat_info[RESP_CHECKRESULT_BLACKLIST_OUT_BLOCK][TOTAL_PKTS]++;
g_frag_stat.stat_info[RESP_CHECKRESULT_BLACKLIST_OUT_BLOCK][TOTAL_BYTES] += buflen;
@@ -1081,6 +1081,14 @@ void* recv_response_msg(void *param) {
/*recv msg*/
FD_ZERO(&rset);
+ if(g_frag_run.recv_msg_fd>=0)
+ {
+ FD_SET(g_frag_run.recv_msg_fd,&rset);
+ }
+ if(g_frag_run.recv_msg_sd>=0)
+ {
+ FD_SET(g_frag_run.recv_msg_sd,&rset);
+ }
FD_SET(g_frag_run.recv_msg_fd,&rset);
FD_SET(g_frag_run.recv_msg_sd,&rset);
if(-1==select(maxfdpl,&rset,NULL,NULL,NULL))
|