Merge branch 'master' into cmake_ver

Author: hecko

.github/workflows/build_test.yml

@@ -8,6 +8,9 @@ on:
     branches:
       - '**'
 
+permissions:
+  contents: read
+
 jobs:
   rpm_test_build:
     runs-on: ubuntu-latest

VERSION

@@ -1 +1 @@
-2.0.1
+2.1.0

apps/diameter_client/lib_dbase/avp.c

@@ -386,12 +386,16 @@ char*  AAAConvertAVPToString(AAA_AVP *avp, char *dest, unsigned int destLen)
 	       "flags=%x;\nDataType=%u;VendorID=%u;DataLen=%u;\n",
 	       avp->prev,avp,avp->next,avp->packetType,avp->code,avp->flags,
 	       avp->type,avp->vendorId,avp->data.len);
+  if (l < 0 || (unsigned int)l >= destLen) l = destLen - 1;
   if ((it = avp->groupedHead)) {
     l+=snprintf(dest+l,destLen-l, "Group members:\n---\n");
+    if ((unsigned int)l >= destLen) l = destLen - 1;
     while (it) {
       DBG("print...\n");
       l+=strlen(AAAConvertAVPToString(it, dest+l, destLen-l));
+      if ((unsigned int)l >= destLen) l = destLen - 1;
       l+=snprintf(dest+l,destLen-l, "\n---\n");
+      if ((unsigned int)l >= destLen) l = destLen - 1;
       it = AAAGetNextAVP(it);
     }
   } else {

core/AmB2BMedia.cpp

@@ -781,12 +781,12 @@ void AmB2BMedia::replaceConnectionAddress(AmSdp &parser_sdp, bool a_leg,
 	  if (a_leg) {
 	    audio_stream_it->a.setLocalIP(relay_address);
 	    it->port = audio_stream_it->a.getLocalPort();
-            replaceRtcpAttr(*it, relay_address, audio_stream_it->a.getLocalRtcpPort());
+            replaceRtcpAttr(*it, relay_public_address, audio_stream_it->a.getLocalRtcpPort());
 	  }
 	  else {
 	    audio_stream_it->b.setLocalIP(relay_address);
 	    it->port = audio_stream_it->b.getLocalPort();
-            replaceRtcpAttr(*it, relay_address, audio_stream_it->b.getLocalRtcpPort());
+            replaceRtcpAttr(*it, relay_public_address, audio_stream_it->b.getLocalRtcpPort());
 	  }
 	  if(!replaced_ports.empty()) replaced_ports += "/";
 	  replaced_ports += int2str(it->port);
@@ -816,14 +816,14 @@ void AmB2BMedia::replaceConnectionAddress(AmSdp &parser_sdp, bool a_leg,
 	      (*relay_stream_it)->a.setLocalIP(relay_address);
 	    }
 	    it->port = (*relay_stream_it)->a.getLocalPort();
-            replaceRtcpAttr(*it, relay_address, (*relay_stream_it)->a.getLocalRtcpPort());
+            replaceRtcpAttr(*it, relay_public_address, (*relay_stream_it)->a.getLocalRtcpPort());
 	  }
 	  else {
 	    if(!(*relay_stream_it)->b.hasLocalSocket()){
 	      (*relay_stream_it)->b.setLocalIP(relay_address);
 	    }
 	    it->port = (*relay_stream_it)->b.getLocalPort();
-            replaceRtcpAttr(*it, relay_address, (*relay_stream_it)->b.getLocalRtcpPort());
+            replaceRtcpAttr(*it, relay_public_address, (*relay_stream_it)->b.getLocalRtcpPort());
 	  }
 	  if(!replaced_ports.empty()) replaced_ports += "/";
 	  replaced_ports += int2str(it->port);

core/sip/parse_common.cpp

@@ -201,7 +201,7 @@ static int _parse_gen_params(list<sip_avp*>* params, const char** c,
 
 	    case '\"':
 		st = VP_PVALUE_QUOTED;
-		beg = *c;
+		beg = *c + 1;
 		break;
 
 	    case ';':
@@ -250,16 +250,17 @@ static int _parse_gen_params(list<sip_avp*>* params, const char** c,
 
 	    case '\"':
 		st = VP_PARAM_SEP;
-		avp->value.set(beg,*c+1-beg);
+		avp->value.set(beg,*c-beg);
 		params->push_back(avp.release());
 		avp.reset(new sip_avp());
 		break;
 
 	    case '\\':
-		if(!*(++(*c))){
+		if(*c + 1 >= end){
 		    DBG("Escape char in quoted str at EoT!!!\n");
 		    return MALFORMED_SIP_MSG;
 		}
+		++(*c);
 		break;
 	    }
 	    break;

core/tests/test_uriparser.cpp

@@ -142,7 +142,8 @@ FCTMF_SUITE_BGN(test_uriparser) {
     FCT_TEST_BGN(uriparser_params_dname6) {
       AmUriParser p;
       size_t end;
-      fct_chk(p.parse_contact("<sip:alice@atlanta.com>;+g.3gpp.icsi-ref=\"urn%3Aurn-7%3A3gpp-service.ims.icsi.mmtel\";video;mobility=\"mobile\"", 0, end));
+      bool parsed = p.parse_contact("<sip:alice@atlanta.com>;+g.3gpp.icsi-ref=\"urn%3Aurn-7%3A3gpp-service.ims.icsi.mmtel\";video;mobility=\"mobile\"", 0, end);
+      fct_chk(parsed);
       fct_chk( p.params.size()==3);
     } FCT_TEST_END();
 } FCTMF_SUITE_END();