Module: kamailio Branch: master Commit: 1e2060c0e0aa28fc1c2129d5e5fe3e210827e850 URL: https://github.com/kamailio/kamailio/commit/1e2060c0e0aa28fc1c2129d5e5fe3e21...

Author: Daniel-Constantin Mierla miconda@gmail.com Committer: Daniel-Constantin Mierla miconda@gmail.com Date: 2016-10-28T16:09:40+02:00

pua: one more proper propagation of ua_flags in subs_cbparam_indlg()

---

Modified: modules/pua/send_subscribe.c

---

Diff: https://github.com/kamailio/kamailio/commit/1e2060c0e0aa28fc1c2129d5e5fe3e21... Patch: https://github.com/kamailio/kamailio/commit/1e2060c0e0aa28fc1c2129d5e5fe3e21...

---

diff --git a/modules/pua/send_subscribe.c b/modules/pua/send_subscribe.c index 0998119..bbb9e2c 100644 --- a/modules/pua/send_subscribe.c +++ b/modules/pua/send_subscribe.c @@ -895,13 +895,13 @@ ua_pres_t* subs_cbparam_indlg(ua_pres_t* subs, int expires, int ua_flag) memcpy(hentity->outbound_proxy->s, subs->outbound_proxy->s, subs->outbound_proxy->len); hentity->outbound_proxy->len= subs->outbound_proxy->len; size+= subs->outbound_proxy->len; - } + }

if(subs->id.s) { CONT_COPY(hentity, hentity->id, subs->id) } - + if(subs->remote_contact.s) { CONT_COPY(hentity, hentity->remote_contact, subs->remote_contact) @@ -918,11 +918,11 @@ ua_pres_t* subs_cbparam_indlg(ua_pres_t* subs, int expires, int ua_flag) size+= subs->extra_headers->len; } /* copy dialog information */ - + CONT_COPY(hentity, hentity->to_tag, subs->to_tag) CONT_COPY(hentity, hentity->from_tag, subs->from_tag) CONT_COPY(hentity, hentity->call_id, subs->call_id) - + if(expires< 0) hentity->desired_expires= 0; else @@ -930,12 +930,12 @@ ua_pres_t* subs_cbparam_indlg(ua_pres_t* subs, int expires, int ua_flag)

hentity->flag= subs->flag; hentity->event= subs->event; - hentity->ua_flag= hentity->ua_flag; + hentity->ua_flag= subs->ua_flag; hentity->cb_param= subs->cb_param;

return hentity;

-} +}

/**