Module: kamailio Branch: master Commit: 92054daa6b1a70a33912c52e6e6ff3dcc4bd7a77 URL: https://github.com/kamailio/kamailio/commit/92054daa6b1a70a33912c52e6e6ff3dc...
Author: schoberw walter.schober@neotel.at Committer: Daniel-Constantin Mierla miconda@gmail.com Date: 2016-03-09T11:04:30+01:00
rr: append_fromtag on upstream in-dialog requests
Record-Routing for in-dialog request are not needed by RFC 3162. But there are many clients out there not sending initial route-set in in-dialog requests. To provided them with the initial route-set together with UAC modified requests the ;ftag parameter must be the to-tag on upstream requests.
append_fromtag parameter added the tag value from "from" header always, even on upstream. This is fixed here.
It is not done on record_route_preset(). This should not be called on record routing anyway.
---
Modified: modules/rr/record.c
---
Diff: https://github.com/kamailio/kamailio/commit/92054daa6b1a70a33912c52e6e6ff3dc... Patch: https://github.com/kamailio/kamailio/commit/92054daa6b1a70a33912c52e6e6ff3dc...
---
diff --git a/modules/rr/record.c b/modules/rr/record.c index 3af771d..b8f526e 100644 --- a/modules/rr/record.c +++ b/modules/rr/record.c @@ -40,6 +40,7 @@ #include "../../data_lump.h" #include "record.h" #include "rr_mod.h" +#include "loose.h"
#define RR_PREFIX_SIP "Record-Route: <sip:" @@ -375,7 +376,6 @@ int record_route(struct sip_msg* _m, str *params) { struct lump* l, *l2; str user = {NULL, 0}; - struct to_body* from = NULL; str* tag; int use_ob = rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0; int sips; @@ -404,13 +404,21 @@ int record_route(struct sip_msg* _m, str *params) }
if (append_fromtag) { - if (parse_from_header(_m) < 0) { - LM_ERR("From parsing failed\n"); - ret = -2; - goto error; + if (is_direction(_m, RR_FLOW_UPSTREAM) == 0) { + if (parse_to_header(_m) < 0) { + LM_ERR("To parsing failed\n"); + ret = -2; + goto error; + } + tag = &((struct to_body*)_m->to->parsed)->tag_value; + } else { + if (parse_from_header(_m) < 0) { + LM_ERR("From parsing failed\n"); + ret = -2; + goto error; + } + tag = &((struct to_body*)_m->from->parsed)->tag_value; } - from = (struct to_body*)_m->from->parsed; - tag = &from->tag_value; } else { tag = 0; } @@ -777,12 +785,23 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) }
if (append_fromtag) { - if (parse_from_header(_m) < 0) { - LM_ERR("From parsing failed\n"); - ret = -2; - goto error; + if (is_direction(_m, RR_FLOW_UPSTREAM) == 0) { + if (parse_to_header(_m) < 0) { + LM_ERR("To parsing failed\n"); + ret = -2; + goto error; + } + tag = &((struct to_body*)_m->to->parsed)->tag_value; + } else { + if (parse_from_header(_m) < 0) { + LM_ERR("From parsing failed\n"); + ret = -2; + goto error; + } + tag = &((struct to_body*)_m->from->parsed)->tag_value; } - tag = &((struct to_body*)_m->from->parsed)->tag_value; + } else { + tag = 0; }
sips = rr_is_sips(_m);
-
Daniel-Constantin Mierla