diff options
| -rw-r--r-- | src/tsg_action.cpp | 6 | ||||
| -rw-r--r-- | src/tsg_entry.cpp | 11 | ||||
| -rw-r--r-- | src/tsg_protocol_common.h | 2 | ||||
| -rw-r--r-- | src/tsg_tamper.cpp | 45 |
4 files changed, 43 insertions, 21 deletions
diff --git a/src/tsg_action.cpp b/src/tsg_action.cpp index 2d05d6c..3f4db6d 100644 --- a/src/tsg_action.cpp +++ b/src/tsg_action.cpp @@ -741,6 +741,7 @@ static unsigned char do_action_tamper(const struct streaminfo *a_stream, Maat_ru if(_context->method_type != TSG_METHOD_TYPE_TAMPER) { _context->method_type=TSG_METHOD_TYPE_TAMPER; + _context->tamper_count = 1; } else { @@ -756,7 +757,10 @@ static unsigned char do_action_tamper(const struct streaminfo *a_stream, Maat_ru } } - return send_tamper_xxx(a_stream, user_data); + if(0 == send_tamper_xxx(a_stream, user_data)){ + return STATE_DROPPKT; + } + return STATE_GIVEME; } unsigned char tsg_deal_deny_action(const struct streaminfo *a_stream, Maat_rule_t *p_result, tsg_protocol_t protocol, enum ACTION_RETURN_TYPE type, const void *user_data) diff --git a/src/tsg_entry.cpp b/src/tsg_entry.cpp index 60cf024..04931ce 100644 --- a/src/tsg_entry.cpp +++ b/src/tsg_entry.cpp @@ -1743,13 +1743,18 @@ static unsigned char tsg_master_all_entry(const struct streaminfo *a_stream, uns } break; case TSG_METHOD_TYPE_TAMPER: - ret = send_tamper_xxx(a_stream, a_packet); - context->tamper_count += 1; - if(ret==STATE_DROPPKT){ + if(0 == send_tamper_xxx(a_stream, a_packet)){ state|=APP_STATE_GIVEME|APP_STATE_DROPPKT; }else{ state=APP_STATE_GIVEME; } + context->tamper_count += 1; + MESA_handle_runtime_log(g_tsg_para.logger, + RLOG_LV_DEBUG, + __FUNCTION__, + "Addr: %s, send_tamper_xxx num %ld", + PRINTADDR(a_stream, g_tsg_para.level), + context->tamper_count); break; default: break; diff --git a/src/tsg_protocol_common.h b/src/tsg_protocol_common.h index 3eb775c..4d50578 100644 --- a/src/tsg_protocol_common.h +++ b/src/tsg_protocol_common.h @@ -117,7 +117,7 @@ int tsg_send_inject_packet(const struct streaminfo *a_stream, enum sapp_inject_o unsigned char do_action_redirect_dns(const struct streaminfo *a_stream, Maat_rule_t *p_result, struct compile_user_region *user_region, const void *user_data); unsigned char send_icmp_unreachable(const struct streaminfo *a_stream, const void *raw_pkt); -unsigned char send_tamper_xxx(const struct streaminfo *a_stream, const void *raw_pkt); +int send_tamper_xxx(const struct streaminfo *a_stream, const void *raw_pkt); #endif diff --git a/src/tsg_tamper.cpp b/src/tsg_tamper.cpp index 8f09bae..879b0a0 100644 --- a/src/tsg_tamper.cpp +++ b/src/tsg_tamper.cpp @@ -55,38 +55,51 @@ int tamper_calc(char *str, int endlen) return 0; } -unsigned char send_tamper_xxx(const struct streaminfo *a_stream, const void *raw_pkt) +int send_tamper_xxx(const struct streaminfo *a_stream, const void *raw_pkt) { const char *p_trans_payload = NULL; int trans_layload_len = 0; char tamper_buf[MTU_LEN] = {0}; - int ret = 0; + int tamper_index = 0; + int ret = -1; if(a_stream==NULL){ - return STATE_GIVEME; + return -1; } p_trans_payload = (char *)a_stream->ptcpdetail->pdata; trans_layload_len = a_stream->ptcpdetail->datalen; if((p_trans_payload==NULL)||(trans_layload_len<=4)){ - return STATE_GIVEME; + MESA_handle_runtime_log(g_tsg_para.logger, + RLOG_LV_DEBUG, + __FUNCTION__, + "Addr: %s Packet is not tamper because the payload is too short or there is no payload", + PRINTADDR(a_stream, g_tsg_para.level)); + return -1; } memcpy(tamper_buf, p_trans_payload, trans_layload_len); - ret = tamper_calc(tamper_buf, trans_layload_len); - if(ret > 0){ + tamper_index = tamper_calc(tamper_buf, trans_layload_len); + if(tamper_index > 0){ MESA_handle_runtime_log(g_tsg_para.logger, - RLOG_LV_DEBUG, - __FUNCTION__, - "Modify the index(%d) position of the payload:(old: %x %x %x %x, new: %x %x %x %x)", - ret, - p_trans_payload[ret-1],p_trans_payload[ret],p_trans_payload[ret+1], p_trans_payload[ret+2], - tamper_buf[ret-1], tamper_buf[ret], tamper_buf[ret+1], tamper_buf[ret+2]); - ret=tsg_send_inject_packet(a_stream, SIO_DEFAULT, tamper_buf, trans_layload_len, a_stream->routedir); - if(ret == 0){ - return STATE_DROPPKT; + RLOG_LV_DEBUG, + __FUNCTION__, + "Addr: %s,modify the index(%d) position of the payload:(old: %02x %02x %02x %02x, new: %02x %02x %02x %02x)", + PRINTADDR(a_stream, g_tsg_para.level), + tamper_index, + (uint8_t)p_trans_payload[tamper_index-1], (uint8_t)p_trans_payload[tamper_index], (uint8_t)p_trans_payload[tamper_index+1], (uint8_t)p_trans_payload[tamper_index+2], + (uint8_t)tamper_buf[tamper_index-1], (uint8_t)tamper_buf[tamper_index], (uint8_t)tamper_buf[tamper_index+1], (uint8_t)tamper_buf[tamper_index+2]); + + if(0 == tsg_send_inject_packet(a_stream, SIO_DEFAULT, tamper_buf, trans_layload_len, a_stream->routedir)){ + ret = 0; } + }else{ + MESA_handle_runtime_log(g_tsg_para.logger, + RLOG_LV_DEBUG, + __FUNCTION__, + "Addr: %s num , payload tamper failed because payload data same", + PRINTADDR(a_stream, g_tsg_para.level)); } - return STATE_GIVEME; + return ret; } |