add property for LB's issue usnistgov#59

(cherry picked from commit 0f7b4e5e17da71f81f2bd5f49c7e8fd1edf85acc)
kpouer · Jan 15, 2023 · e03ea69 · e03ea69
1 parent eca1489
commit e03ea69
Show file tree

Hide file tree

Showing 4 changed files with 2,187 additions and 2,168 deletions.
diff --git a/src/gov/nist/javax/sip/SipStackImpl.java b/src/gov/nist/javax/sip/SipStackImpl.java
@@ -1428,6 +1428,9 @@ public SipStackImpl(Properties configurationProperties)
 		super.setPatchRport(Boolean.parseBoolean(configurationProperties.getProperty(
 				"gov.nist.javax.sip.ALWAYS_ADD_RPORT", "false")));
 
+		super.setPatchReceivedRport(Boolean.parseBoolean(configurationProperties.getProperty(
+				"gov.nist.javax.sip.NEVER_ADD_RECEIVED_RPORT", "false")));
+
 		super.cancelClientTransactionChecked = configurationProperties
 				.getProperty(
 						"gov.nist.javax.sip.CANCEL_CLIENT_TRANSACTION_CHECKED",

diff --git a/src/gov/nist/javax/sip/stack/ConnectionOrientedMessageChannel.java b/src/gov/nist/javax/sip/stack/ConnectionOrientedMessageChannel.java
@@ -335,6 +335,7 @@ public void processMessage(SIPMessage sipMessage) throws Exception {
                     }
                 }
 
+              if (!sipStack.isPatchReceivedRport()) {
                 try {
                 	if (mySock != null) { // selfrouting makes socket = null
                         				 // https://jain-sip.dev.java.net/issues/show_bug.cgi?id=297
@@ -374,6 +375,9 @@ public void processMessage(SIPMessage sipMessage) throws Exception {
                 } catch (java.text.ParseException ex) {
                     InternalErrorHandler.handleException(ex);
                 }
+              } else {
+                  logger.logInfo("We did not use recived and rport");
+              }
                 // Use this for outgoing messages as well.
                 if (!this.isCached && mySock != null) { // self routing makes
 									                    // mySock=null