[sr-dev] git:master:15066536: Merge pull request #1982 from alexyosifov/ipsec_fix_defects

Module: kamailio Branch: master Commit: 15066536e65314f976328fc4387be2a5b53fe455 URL: https://github.com/kamailio/kamailio/commit/15066536e65314f976328fc4387be2a… Author: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-06-13T22:05:21+03:00 Merge pull request #1982 from alexyosifov/ipsec_fix_defects --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_registrar_pcscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/15066536e65314f976328fc4387be2a… Patch: https://github.com/kamailio/kamailio/commit/15066536e65314f976328fc4387be2a… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 576bf56ded..f696ac9e71 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -571,7 +571,7 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d) struct cell *t = tmb.t_gett(); if (!t) { LM_ERR("Error getting transaction\n"); - goto cleanup; + return ret; } req = t->uas.request; @@ -662,7 +662,7 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d) struct socket_info * client_sock = grep_sock_info(via_host.af == AF_INET ? &ipsec_listen_addr : &ipsec_listen_addr6, src_port, dst_proto); if(!client_sock) { LM_ERR("Error calling grep_sock_info() for ipsec client port\n"); - return -1; + goto cleanup; } m->force_send_socket = client_sock; diff --git a/src/modules/ims_registrar_pcscf/save.c b/src/modules/ims_registrar_pcscf/save.c index fb701e6af6..61a1d7a001 100644 --- a/src/modules/ims_registrar_pcscf/save.c +++ b/src/modules/ims_registrar_pcscf/save.c @@ -444,12 +444,6 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags) { cscf_get_p_associated_uri(_m, &public_ids, &num_public_ids, 1); service_routes = cscf_get_service_route(_m, &num_service_routes, 1); - { - struct via_body* vb = cscf_get_ue_via(_m); - LM_DBG("Save contact with AOR(uri) [%.*s], proto %d, port %d\n", - cb->contacts->uri.len, cb->contacts->uri.s, vb->proto, vb->port?vb->port:5060); - } - //update contacts if (!update_contacts(req, _m, _d, cb->star, expires_hdr, public_ids, num_public_ids, service_routes, num_service_routes, 0)) { LM_ERR("failed to update pcontact\n");