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

pv: Add support to $hfl $hflc for Diversion header #3651

Closed
wants to merge 6 commits into from
Closed

pv: Add support to $hfl $hflc for Diversion header #3651

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
088a100
parser: Extend diversion for multiple bodies
xkaraman Nov 27, 2023
572eb45
pv: Add hfl and hflc support for Diversion header
xkaraman Nov 27, 2023
1b6b552
parser: Fix free leakage
xkaraman Nov 29, 2023
67ffe24
parser: Fix diversion leakage
xkaraman Dec 4, 2023
ce31601
parser: Explicit cast to required type
xkaraman Dec 4, 2023
90a1243
Merge branch 'master' into hfl_hflc_diversion_fix
miconda Dec 8, 2023
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
146 changes: 146 additions & 0 deletions src/modules/pv/pv_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2091,6 +2091,8 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res)
rr_t *rrb = NULL;
contact_t *cb = NULL;
diversion_body_t *db = NULL;
p_id_body_t *ppib = NULL;
p_id_body_t *paib = NULL;
hdr_field_t *hf = NULL;
hdr_field_t thdr = {0};
int n = 0;
Expand Down Expand Up @@ -2390,6 +2392,110 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res)
LM_DBG("unexpected diversion index out of range\n");
return pv_get_null(msg, param, res);
}

if((tv.flags == 0) && (tv.ri == HDR_PPI_T)) {
if(msg->ppi == NULL) {
LM_DBG("no PPI header\n");
return pv_get_null(msg, param, res);
}

if(parse_ppi_header(msg) < 0) {
LM_DBG("failed to parse PPI headers\n");
return pv_get_null(msg, param, res);
}

ppib = (p_id_body_t *)msg->ppi->parsed;
ppi_header_count = 0;

while(ppib != NULL) {
ppi_header_count += ppib->num_ids;
ppib = ppib->next;
}

if(idx < 0) {
idx = -idx;
if(idx > ppi_header_count) {
LM_DBG("index out of range\n");
return pv_get_null(msg, param, res);
}
idx = ppi_header_count - idx;
}

n = 0;
ppib = (p_id_body_t *)msg->ppi->parsed;
/* loop through all parsed ppi headers lists */
while(ppib != NULL) {
if(n + ppib->num_ids > idx) {
/* Calculate the index within this specific list */
int innerIndex = idx - n;

/* Access the desired element within this list */
sval.s = ppib->id[innerIndex].body.s;
sval.len = ppib->id[innerIndex].body.len;
trim(&sval);
res->rs = sval;
return 0;
}

/* Move to the next ppi header list */
n += ppib->num_ids;
ppib = ppib->next;
}
LM_DBG("unexpected PPI index out of range\n");
return pv_get_null(msg, param, res);
}

if((tv.flags == 0) && (tv.ri == HDR_PAI_T)) {
if(msg->pai == NULL) {
LM_DBG("no PAI header\n");
return pv_get_null(msg, param, res);
}

if(parse_pai_header(msg) < 0) {
LM_DBG("failed to parse PAI headers\n");
return pv_get_null(msg, param, res);
}

paib = (p_id_body_t *)msg->pai->parsed;
pai_header_count = 0;

while(paib != NULL) {
pai_header_count += paib->num_ids;
paib = paib->next;
}

if(idx < 0) {
idx = -idx;
if(idx > pai_header_count) {
LM_DBG("index out of range\n");
return pv_get_null(msg, param, res);
}
idx = pai_header_count - idx;
}

n = 0;
paib = (p_id_body_t *)msg->pai->parsed;
/* loop through all parsed PAI headers lists */
while(paib != NULL) {
if(n + paib->num_ids > idx) {
/* Calculate the index within this specific list */
int innerIndex = idx - n;

/* Access the desired element within this list */
sval.s = paib->id[innerIndex].body.s;
sval.len = paib->id[innerIndex].body.len;
trim(&sval);
res->rs = sval;
return 0;
}

/* Move to the next PAI header list */
n += paib->num_ids;
paib = paib->next;
}
LM_DBG("unexpected PAI index out of range\n");
return pv_get_null(msg, param, res);
}

return pv_get_hdr_helper(msg, param, res, &tv, idx, idxf);
}
Expand Down Expand Up @@ -2527,6 +2633,46 @@ int pv_get_hflc(sip_msg_t *msg, pv_param_t *param, pv_value_t *res)
db = db->next;
}
return pv_get_sintval(msg, param, res, diversion_body_count);
}

if((tv.flags == 0) && (tv.ri == HDR_PPI_T)) {
if(msg->ppi == NULL) {
LM_DBG("no PPI header\n");
return pv_get_sintval(msg, param, res, 0);
}

if(parse_ppi_header(msg) < 0) {
LM_DBG("failed to parse PPI headers\n");
return pv_get_sintval(msg, param, res, 0);
}

ppib = (p_id_body_t *)msg->ppi->parsed;
n = 0;
while(ppib != NULL) {
n += ppib->num_ids;
ppib = ppib->next;
}
return pv_get_sintval(msg, param, res, n);
}

if((tv.flags == 0) && (tv.ri == HDR_PAI_T)) {
if(msg->pai == NULL) {
LM_DBG("no PAI header\n");
return pv_get_sintval(msg, param, res, 0);
}
if(parse_pai_header(msg) < 0) {
LM_DBG("failed to parse PAI headers\n");
return pv_get_sintval(msg, param, res, 0);
}

paib = (p_id_body_t *)msg->pai->parsed;
n = 0;
while(paib != NULL) {
n += paib->num_ids;
paib = paib->next;
}
return pv_get_sintval(msg, param, res, n);

}

for(hf = msg->headers; hf; hf = hf->next) {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.