[sr-dev] git:5.4:19128f21: usrloc: print Route header name in keepalive when Path is present

Module: kamailio Branch: 5.4 Commit: 19128f2121d8b859a6a546dfdf2c0855b9bd9502 URL: https://github.com/kamailio/kamailio/commit/19128f2121d8b859a6a546dfdf2c085… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: 2020-08-18T17:51:33+02:00 usrloc: print Route header name in keepalive when Path is present - related to GH #2446 (cherry picked from commit d49d6b89ceb311598a89cfd789d180412b46a4af) --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/19128f2121d8b859a6a546dfdf2c085… Patch: https://github.com/kamailio/kamailio/commit/19128f2121d8b859a6a546dfdf2c085… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 4439e193c0..6d93717db5 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -43,7 +43,7 @@ static int ul_ka_send(str *kamsg, dest_info_t *kadst); /** - * + * _KAMETHOD_ _URI_ SIP/2.0\r\n Via: SIP/2.0/_PROTO_ _IP_:_PORT_;branch=z9hG4bKx._GCNT_._BCNT_.0\r\n __KAROUTES__ @@ -60,7 +60,7 @@ Content-Length: 0\r\n\r\n" #define ULKA_MSG "%.*s %.*s SIP/2.0\r\n" \ "Via: SIP/2.0/%.*s %.*s:%.*s;branch=z9hG4bKx.%u.%u.0\r\n" \ - "%.*s%.*s" \ + "%s%.*s%.*s" \ "From: <%.*s>;tag=%.*s-%x-%lx-%lx-%x.%x\r\n" \ "To: <sip:%.*s%s%.*s>\r\n" \ "Call-ID: " ULKA_CALLID_PREFIX "%u.%u\r\n" \ @@ -197,6 +197,7 @@ int ul_ka_urecord(urecord_t *ur) vaddr.len, vaddr.s, vport.len, vport.s, _ul_ka_counter, bcnt, + (uc->path.len>0)?"Route: ":"", (uc->path.len>0)?uc->path.len:0, (uc->path.len>0)?uc->path.s:"", (uc->path.len>0)?2:0,