Skip to content

Commit

Permalink
sipcapture: remove excess byte order conversion
Browse files Browse the repository at this point in the history 
- buffer pointer `tmp` in hepv3_get_chunk() was assigned to hg->time_(µ)sec
- therefore everytime route script calls pseudovariables, part of original
  `buf` was byte converted
  • Loading branch information
@mslehto
mslehto committed Jul 27, 2017
1 parent 6ddca2e commit 6e43bf8
Showing 1 changed file with 16 additions and 28 deletions.
44 changes: 16 additions & 28 deletions src/modules/sipcapture/hep.c
View file
Expand Up @@ -372,16 +372,14 @@ int parsing_hepv3_message(char *buf, unsigned int len) {
break;
case 9:
hg->time_sec = (hep_chunk_uint32_t *) (tmp);
hg->time_sec->data = ntohl(hg->time_sec->data);
heptime->tv_sec = hg->time_sec->data;
heptime->tv_sec = ntohl(hg->time_sec->data);
i+=chunk_length;
totelem++;
break;
break;

case 10:
hg->time_usec = (hep_chunk_uint32_t *) (tmp);
hg->time_usec->data = ntohl(hg->time_usec->data);
heptime->tv_usec = hg->time_usec->data;
heptime->tv_usec = ntohl(hg->time_usec->data);
i+=chunk_length;
totelem++;
break;
Expand All @@ -394,8 +392,8 @@ int parsing_hepv3_message(char *buf, unsigned int len) {

case 12:
hg->capt_id = (hep_chunk_uint32_t *) (tmp);
i+=chunk_length;
heptime->captid = ntohl(hg->capt_id->data);
i+=chunk_length;
totelem++;
break;

Expand Down Expand Up @@ -483,13 +481,6 @@ int parsing_hepv3_message(char *buf, unsigned int len) {
si->name.s = si->address_str.s;
ri.bind_address=si;


/*TIME*/
heptime->tv_sec = hg->time_sec->data;
heptime->tv_usec = hg->time_usec->data;
heptime->captid = ntohl(hg->capt_id->data);


if(payload != NULL ) {
/* and now recieve message */
if (hg->proto_t->data == 5) receive_logging_json_msg(payload, payload_len, hg, "rtcp_capture");
Expand Down Expand Up @@ -646,19 +637,17 @@ int hepv3_message_parse(char *buf, unsigned int len, sip_msg_t* msg) {
break;
case 9:
hg->time_sec = (hep_chunk_uint32_t *) (tmp);
hg->time_sec->data = ntohl(hg->time_sec->data);
heptime->tv_sec = hg->time_sec->data;
heptime->tv_sec = ntohl(hg->time_sec->data);
i+=chunk_length;
totelem++;
break;
break;

case 10:
hg->time_usec = (hep_chunk_uint32_t *) (tmp);
hg->time_usec->data = ntohl(hg->time_usec->data);
heptime->tv_usec = hg->time_usec->data;
heptime->tv_usec = ntohl(hg->time_usec->data);
i+=chunk_length;
totelem++;
break;
break;

case 11:
hg->proto_t = (hep_chunk_uint8_t *) (tmp);
Expand Down Expand Up @@ -728,10 +717,10 @@ int hepv3_message_parse(char *buf, unsigned int len, sip_msg_t* msg) {

if(payload != NULL) ret = len - payload_len;

/*TIME*/
heptime->tv_sec = hg->time_sec->data;
heptime->tv_usec = hg->time_usec->data;
heptime->captid = ntohl(hg->capt_id->data);





done:

Expand Down Expand Up @@ -987,11 +976,10 @@ int hepv3_get_chunk(struct sip_msg *msg, char *buf, unsigned int len, int req_ch
hg->time_sec->data = ntohl(hg->time_sec->data);
ret = pv_get_uintval(msg, param, res, hg->time_sec->data);
goto done;

case 10:
hg->time_usec = (hep_chunk_uint32_t *) (tmp);
hg->time_usec->data = ntohl(hg->time_usec->data);
ret = pv_get_uintval(msg, param, res, hg->time_usec->data);
ret = pv_get_uintval(msg, param, res, ntohl(hg->time_usec->data));
goto done;

case 11:
Expand Down

0 comments on commit 6e43bf8

Please sign in to comment.