Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sipcapture: expose pv $hep(src_ip) #879

Closed
wants to merge 2 commits into from
Closed

sipcapture: expose pv $hep(src_ip) #879

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b868081
sipcapture: expose pv $hep(src_ip)
davidcsi Dec 2, 2016
fb6328e
sipcapture: Set char buf_ip as static
davidcsi Dec 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
70 changes: 35 additions & 35 deletions modules/sipcapture/sipcapture.c
View file
Open in desktop
Expand Up @@ -284,7 +284,7 @@ static cmd_export_t cmds[] = {
{"sip_capture", (cmd_function)w_sip_capture, 2, sipcapture_fixup, 0, ANY_ROUTE },
{"report_capture", (cmd_function)w_report_capture, 1, reportcapture_fixup, 0, ANY_ROUTE },
{"report_capture", (cmd_function)w_report_capture, 2, reportcapture_fixup, 0, ANY_ROUTE },
{"report_capture", (cmd_function)w_report_capture, 3, reportcapture_fixup, 0, ANY_ROUTE },
{"report_capture", (cmd_function)w_report_capture, 3, reportcapture_fixup, 0, ANY_ROUTE },
{"float2int", (cmd_function)w_float2int, 2, float2int_fixup, 0, ANY_ROUTE },
{0, 0, 0, 0, 0, 0}
};
Expand All @@ -295,7 +295,7 @@ static pv_export_t mod_pvs[] = {
pv_parse_hep_name, 0, 0, 0 },
{ {0, 0}, 0, 0, 0, 0, 0, 0, 0 }
};


int capture_mode_param(modparam_t type, void *val);

Expand Down Expand Up @@ -855,29 +855,29 @@ static int mod_init(void)
*capture_on_flag = capture_on;

if(nonsip_hook)
{
{
route_no=route_get(&event_rt, "sipcapture:request");
if (route_no==-1)
{
LM_ERR("failed to find event_route[sipcapture:request]\n");
return -1;
}

if (event_rt.rlist[route_no]==0)
{
LM_ERR("event_route[sipcapture:request] is empty\n");
return -1;
}

hep_route_no=route_no;
if(sr_event_register_cb(SREV_RCV_NOSIP, nosip_hep_msg) < 0)

if(sr_event_register_cb(SREV_RCV_NOSIP, nosip_hep_msg) < 0)
{
LM_ERR("failed to register SREV_RCV_NOSIP event\n");
return -1;
return -1;
}
}
else
else
{
/* register DGRAM event */
if(sr_event_register_cb(SREV_NET_DGRAM_IN, hep_msg_received) < 0) {
Expand Down Expand Up @@ -1521,17 +1521,17 @@ static int sip_capture_store(struct _sipcapture_object *sco, str *dtable, _captu
tmp.len = sco->msg.len;

db_vals[40].val.blob_val = tmp;

db_keys[41] = &custom_field1_column;
db_vals[41].type = DB1_STR;
db_vals[41].nul = 0;
db_vals[41].val.str_val = sco->custom1;

db_keys[42] = &custom_field2_column;
db_vals[42].type = DB1_STR;
db_vals[42].nul = 0;
db_vals[42].val.str_val = sco->custom2;

db_keys[43] = &custom_field3_column;
db_vals[43].type = DB1_STR;
db_vals[43].nul = 0;
Expand Down Expand Up @@ -1897,19 +1897,19 @@ static int sip_capture(struct sip_msg *msg, str *_table, _capture_mode_data_t *
sco.rtp_stat = tmphdr[3]->body;
}
else { EMPTY_STR(sco.rtp_stat); }

/* Custom - field1 */
if(custom_field1_header.len > 0 && (tmphdr[4] = get_hdr_by_name(msg,custom_field1_header.s, custom_field1_header.len)) != NULL) {
sco.custom1 = tmphdr[4]->body;
}
else { EMPTY_STR(sco.custom1); }

/* Custom - field2 */
if(custom_field3_header.len > 0 && (tmphdr[5] = get_hdr_by_name(msg,custom_field2_header.s, custom_field2_header.len)) != NULL) {
sco.custom2 = tmphdr[5]->body;
}
else { EMPTY_STR(sco.custom2); }

/* Custom - field3 */
if(custom_field3_header.len > 0 && (tmphdr[6] = get_hdr_by_name(msg,custom_field3_header.s, custom_field3_header.len)) != NULL) {
sco.custom3 = tmphdr[6]->body;
Expand Down Expand Up @@ -2717,12 +2717,12 @@ static int nosip_hep_msg(void *data)
int ret = 0;

msg = (sip_msg_t*)data;

struct hep_hdr *heph;

buf = msg->buf;
len = msg->len;

/* first send to route */
init_run_actions_ctx(&ra_ctx);
ret = run_actions(&ra_ctx, event_rt.rlist[hep_route_no], msg);
Expand All @@ -2731,33 +2731,33 @@ static int nosip_hep_msg(void *data)

/* hep_hdr */
heph = (struct hep_hdr*) msg->buf;

if(heph->hp_v == 1 || heph->hp_v == 2) {

LOG(L_ERR, "ERROR: HEP v 1/2: v:[%d] l:[%d]\n",heph->hp_v, heph->hp_l);
if((len = hepv2_message_parse(buf, len, msg)) < 0)
{
if((len = hepv2_message_parse(buf, len, msg)) < 0)
{
LOG(L_ERR, "ERROR: during hepv2 parsing :[%d]\n", len);
return 0;
}

buf = msg->buf+len;
len = msg->len - len;

msg->buf = buf;
msg->len = len;
}
else if(!memcmp(msg->buf, "\x48\x45\x50\x33",4) || !memcmp(msg->buf, "\x45\x45\x50\x31",4)) {

if((len = hepv3_message_parse(buf, len, msg)) < 0)
{
if((len = hepv3_message_parse(buf, len, msg)) < 0)
{
LOG(L_ERR, "ERROR: during hepv3 parsing :[%d]\n", len);
return 0;
}

buf = msg->buf+len;
len = msg->len - len;

msg->buf = buf;
msg->len = len;
}
Expand All @@ -2769,10 +2769,10 @@ static int nosip_hep_msg(void *data)
}

if (parse_msg(buf, len, msg)!=0) {
LOG(L_ERR, "couldn't parse sip message\n");
LOG(L_ERR, "couldn't parse sip message\n");
return -1;
}

return ret;
}

Expand All @@ -2782,10 +2782,10 @@ static int hep_version(struct sip_msg *msg)
struct hep_hdr *heph;
/* hep_hdr */
heph = (struct hep_hdr*) msg->buf;

if(heph->hp_v == 1 || heph->hp_v == 2) return heph->hp_v;
else if(!memcmp(msg->buf, "\x48\x45\x50\x33",4) || !memcmp(msg->buf, "\x45\x45\x50\x31",4)) return 3;

return -1;
}

Expand Down Expand Up @@ -2865,15 +2865,15 @@ static int pv_get_hep(struct sip_msg *msg, pv_param_t *param, pv_value_t *res)
{
if(param==NULL) return -1;

char buf_ip[IP_ADDR_MAX_STR_SIZE+12];
static char buf_ip[IP_ADDR_MAX_STR_SIZE+12];
str src_ip;

switch(param->pvn.u.isname.name.n)
{
case 0:
return pv_get_uintval(msg, param, res, hep_version(msg));
case 1:
return pv_get_uintval(msg, param, res, hep_version(msg));
return pv_get_uintval(msg, param, res, hep_version(msg));
case 1:
return pv_get_uintval(msg, param, res, hep_version(msg));
case 2:
strcpy(buf_ip, ip_addr2a(&msg->rcv.src_ip));
buf_ip[strlen(buf_ip)] = '\0';
Expand All @@ -2885,4 +2885,4 @@ static int pv_get_hep(struct sip_msg *msg, pv_param_t *param, pv_value_t *res)
}
return 0;
}