git:master:94b4c256: modules/ims_qos modules/ims_registrar_scscf: fix comparison of unsigned expression
Module: kamailio Branch: master Commit: 94b4c25640c0f486c578a9e0670dad0aa5dda0c1 URL: https://github.com/kamailio/kamailio/commit/94b4c25640c0f486c578a9e0670dad0a...
Author: Mikko Lehto mslehto@iki.fi Committer: Mikko Lehto mslehto@iki.fi Date: 2016-05-25T13:49:21+03:00
modules/ims_qos modules/ims_registrar_scscf: fix comparison of unsigned expression
---
Modified: modules/ims_qos/rx_avp.c Modified: modules/ims_registrar_scscf/save.c
---
Diff: https://github.com/kamailio/kamailio/commit/94b4c25640c0f486c578a9e0670dad0a... Patch: https://github.com/kamailio/kamailio/commit/94b4c25640c0f486c578a9e0670dad0a...
---
diff --git a/modules/ims_qos/rx_avp.c b/modules/ims_qos/rx_avp.c index 657716c..124855c 100644 --- a/modules/ims_qos/rx_avp.c +++ b/modules/ims_qos/rx_avp.c @@ -489,7 +489,7 @@ inline int rx_add_media_component_description_avp(AAAMessage *msg, int number, s // Get A=RS-bandwidth from SDP-Reply: bandwidth = sdp_b_value(rpl_raw_payload, "RS"); LM_DBG("Answer: Got bandwidth %i from b=RS-Line\n", bandwidth); - if (bandwidth >= 0) { + if (bandwidth > 0) { // Add AVP set_4bytes(x,bandwidth); rs_bw = cdpb.AAACreateAVP(AVP_EPC_RS_Bandwidth, @@ -501,7 +501,7 @@ inline int rx_add_media_component_description_avp(AAAMessage *msg, int number, s // Get A=RS-bandwidth from SDP-Reply: bandwidth = sdp_b_value(rpl_raw_payload, "RR"); LM_DBG("Answer: Got bandwidth %i from b=RR-Line\n", bandwidth); - if (bandwidth >= 0) { + if (bandwidth > 0) { // Add AVP set_4bytes(x,bandwidth); rr_bw = cdpb.AAACreateAVP(AVP_EPC_RR_Bandwidth, diff --git a/modules/ims_registrar_scscf/save.c b/modules/ims_registrar_scscf/save.c index 501eaa7..47dcf80 100644 --- a/modules/ims_registrar_scscf/save.c +++ b/modules/ims_registrar_scscf/save.c @@ -111,7 +111,7 @@ static inline int randomize_expires(int expires, int range) { static inline int calc_contact_expires(contact_t *c, unsigned int expires_hdr, int sos_reg) { unsigned int r;
- if (expires_hdr >= 0) + if (expires_hdr > 0) r = expires_hdr; else { r = (sos_reg > 0) ? default_registrar_cfg.em_default_expires : default_registrar_cfg.default_expires;
Hey Mikko,
This changes the 'semantics' of the code and is a bug. Could I suggest rather using 0U to silence your compiler... ;)
Cheers Jason
On Fri, Jun 3, 2016 at 9:25 AM, Mikko Lehto mslehto@iki.fi wrote:
Module: kamailio Branch: master Commit: 94b4c25640c0f486c578a9e0670dad0aa5dda0c1 URL: https://github.com/kamailio/kamailio/commit/94b4c25640c0f486c578a9e0670dad0a...
Author: Mikko Lehto mslehto@iki.fi Committer: Mikko Lehto mslehto@iki.fi Date: 2016-05-25T13:49:21+03:00
modules/ims_qos modules/ims_registrar_scscf: fix comparison of unsigned expression
Modified: modules/ims_qos/rx_avp.c Modified: modules/ims_registrar_scscf/save.c
Diff: https://github.com/kamailio/kamailio/commit/94b4c25640c0f486c578a9e0670dad0a... Patch: https://github.com/kamailio/kamailio/commit/94b4c25640c0f486c578a9e0670dad0a...
diff --git a/modules/ims_qos/rx_avp.c b/modules/ims_qos/rx_avp.c index 657716c..124855c 100644 --- a/modules/ims_qos/rx_avp.c +++ b/modules/ims_qos/rx_avp.c @@ -489,7 +489,7 @@ inline int rx_add_media_component_description_avp(AAAMessage *msg, int number, s // Get A=RS-bandwidth from SDP-Reply: bandwidth = sdp_b_value(rpl_raw_payload, "RS"); LM_DBG("Answer: Got bandwidth %i from b=RS-Line\n", bandwidth);
if (bandwidth >= 0) {
if (bandwidth > 0) { // Add AVP set_4bytes(x,bandwidth); rs_bw = cdpb.AAACreateAVP(AVP_EPC_RS_Bandwidth,@@ -501,7 +501,7 @@ inline int rx_add_media_component_description_avp(AAAMessage *msg, int number, s // Get A=RS-bandwidth from SDP-Reply: bandwidth = sdp_b_value(rpl_raw_payload, "RR"); LM_DBG("Answer: Got bandwidth %i from b=RR-Line\n", bandwidth);
if (bandwidth >= 0) {
if (bandwidth > 0) { // Add AVP set_4bytes(x,bandwidth); rr_bw = cdpb.AAACreateAVP(AVP_EPC_RR_Bandwidth,diff --git a/modules/ims_registrar_scscf/save.c b/modules/ims_registrar_scscf/save.c index 501eaa7..47dcf80 100644 --- a/modules/ims_registrar_scscf/save.c +++ b/modules/ims_registrar_scscf/save.c @@ -111,7 +111,7 @@ static inline int randomize_expires(int expires, int range) { static inline int calc_contact_expires(contact_t *c, unsigned int expires_hdr, int sos_reg) { unsigned int r;
- if (expires_hdr >= 0)
- if (expires_hdr > 0) r = expires_hdr; else { r = (sos_reg > 0) ? default_registrar_cfg.em_default_expires :
default_registrar_cfg.default_expires;
sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Jason Penton jason.penton@smilecoms.com:
This changes the 'semantics' of the code and is a bug. Could I suggest rather using 0U to silence your compiler... ;)
Hi! Daniel already guided me to right direction (GH #637) but looks like I did the revert such a way that master branch got polluted. Sorry about that :|
P.S. Clang warning Wtautological-compare is still shown: https://travis-ci.org/kamailio/kamailio/jobs/135552215
Hey Mikko,
No worries. Will look into your warnings and resolve
Cheers jason
On Mon, 6 Jun 2016 at 17:58 Mikko Lehto mslehto@iki.fi wrote:
Jason Penton jason.penton@smilecoms.com:
This changes the 'semantics' of the code and is a bug. Could I suggest rather using 0U to silence your compiler... ;)
Hi! Daniel already guided me to right direction (GH #637) but looks like I did the revert such a way that master branch got polluted. Sorry about that :|
P.S. Clang warning Wtautological-compare is still shown: https://travis-ci.org/kamailio/kamailio/jobs/135552215
-- Mikko
sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
-
Jason Penton -
Jason Penton -
Mikko Lehto