From 383146456f044919e0078f7a48ba6fd5792f3233 Mon Sep 17 00:00:00 2001
From: Di-Shi Sun <di-shi.sun@transnexus.com>
Date: Thu, 22 May 2025 09:49:18 -0400
Subject: [PATCH] Updated for STIRv2.

---
 RELNOTES.txt                | 3 +++
 include/osp/ospdatatypes.h  | 1 +
 include/osp/osplibversion.h | 2 +-
 include/osp/ospmsgelem.h    | 1 +
 src/ospmsgelem.c            | 2 ++
 src/ospusage.c              | 1 +
 test/test_app.c             | 4 +++-
 7 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/RELNOTES.txt b/RELNOTES.txt
index 7105bf0..0b0e9da 100644
--- a/RELNOTES.txt
+++ b/RELNOTES.txt
@@ -815,3 +815,6 @@ Version 4.30.1 - 2025-01-14
 Version 4.31.0 - 2025-04-25
 * Updated to support 603+.
 
+Version 4.32.0 - 2025-05-22
+* Updated for STIRv2.
+
diff --git a/include/osp/ospdatatypes.h b/include/osp/ospdatatypes.h
index 88c8930..697173d 100644
--- a/include/osp/ospdatatypes.h
+++ b/include/osp/ospdatatypes.h
@@ -177,6 +177,7 @@ typedef enum {
     OSPC_SIPHEADER_PAI,
     OSPC_SIPHEADER_PCI,
     OSPC_SIPHEADER_RPID,
+    OSPC_SIPHEADER_RURI,
     OSPC_SIPHEADER_TO,
     /* Number of termination cause types */
     OSPC_SIPHEADER_NUMBER
diff --git a/include/osp/osplibversion.h b/include/osp/osplibversion.h
index 58aebed..368c194 100644
--- a/include/osp/osplibversion.h
+++ b/include/osp/osplibversion.h
@@ -20,7 +20,7 @@
 #define _OSPLIBVERSION_H
 
 #define OSP_CLIENT_TOOLKIT_VERSION_MAJOR    4
-#define OSP_CLIENT_TOOLKIT_VERSION_MINOR    31
+#define OSP_CLIENT_TOOLKIT_VERSION_MINOR    32
 #define OSP_CLIENT_TOOLKIT_VERSION_BUGFIX   0
 
 #endif /* _OSPLIBVERSION_H */
diff --git a/include/osp/ospmsgelem.h b/include/osp/ospmsgelem.h
index 389bf4e..6a5b50a 100644
--- a/include/osp/ospmsgelem.h
+++ b/include/osp/ospmsgelem.h
@@ -139,6 +139,7 @@ typedef enum {
     OSPC_MELEM_REAUTHRSP,
     OSPC_MELEM_RELATEDREASON,
     OSPC_MELEM_RELEASE,
+    OSPC_MELEM_REQUESTURI,
     OSPC_MELEM_RESOURCES,
     OSPC_MELEM_RFACTOR,
     OSPC_MELEM_RICHCALLDATA,
diff --git a/src/ospmsgelem.c b/src/ospmsgelem.c
index f4d659c..143d103 100644
--- a/src/ospmsgelem.c
+++ b/src/ospmsgelem.c
@@ -136,6 +136,7 @@ const OSPT_MSG_DESC OSPV_MELEM_DESCS[OSPC_MELEM_NUMBER] = {
     { OSPC_MELEM_REAUTHRSP,            "ReauthorizationResponse" },
     { OSPC_MELEM_RELATEDREASON,        "RelatedCallIdReason" },
     { OSPC_MELEM_RELEASE,              "ReleaseSource" },
+    { OSPC_MELEM_REQUESTURI,           "RequestDestinationInfo" },
     { OSPC_MELEM_RESOURCES,            "Resources" },
     { OSPC_MELEM_RFACTOR,              "RFactor" },
     { OSPC_MELEM_RICHCALLDATA,         "RichCallData" },
@@ -203,6 +204,7 @@ const OSPE_MSG_ELEM OSPV_MELEM_SIPHEADER[OSPC_SIPHEADER_NUMBER] = {
     OSPC_MELEM_ASSERTEDID,
     OSPC_MELEM_CHARGEINFO,
     OSPC_MELEM_RPID,
+    OSPC_MELEM_REQUESTURI,
     OSPC_MELEM_TO
 };
 
diff --git a/src/ospusage.c b/src/ospusage.c
index 53594af..adf775d 100644
--- a/src/ospusage.c
+++ b/src/ospusage.c
@@ -377,6 +377,7 @@ unsigned OSPPCallPartyNumToElement(
         case OSPC_MELEM_IDBYPASS:
         case OSPC_MELEM_IDENTITY:
         case OSPC_MELEM_NETTRANSCALLED:
+        case OSPC_MELEM_REQUESTURI:
         case OSPC_MELEM_RPID:
         case OSPC_MELEM_SRCINFO:
         case OSPC_MELEM_TO:
diff --git a/test/test_app.c b/test/test_app.c
index 7c25ca7..c15de26 100644
--- a/test/test_app.c
+++ b/test/test_app.c
@@ -1902,6 +1902,8 @@ int testSetSIPHeaders()
     const char *fingerprints[number] = { "fingerprint1", "fingerprint2", "fingerprint3" };
     int errcode = 0;
 
+    errcode = OSPPTransactionSetSIPHeader(OSPVTransactionHandle, OSPC_SIPHEADER_RURI, OSPC_NFORMAT_SIP, "sips:1002@transnexus.com");
+
     errcode = OSPPTransactionSetSIPHeader(OSPVTransactionHandle, OSPC_SIPHEADER_FROM, OSPC_NFORMAT_E164, "FromE164");
     errcode = OSPPTransactionSetSIPHeader(OSPVTransactionHandle, OSPC_SIPHEADER_FROM, OSPC_NFORMAT_SIP, "<sip:1001@sip.transnexus.com>");
     errcode = OSPPTransactionSetSIPHeader(OSPVTransactionHandle, OSPC_SIPHEADER_FROM, OSPC_NFORMAT_DISPLAYNAME, "Hello Günter ");
@@ -1931,7 +1933,7 @@ int testSetSIPHeaders()
 
     errcode = OSPPTransactionSetRequestDate(OSPVTransactionHandle, time(OSPC_OSNULL));
     errcode = OSPPTransactionSetFingerprint(OSPVTransactionHandle, number, fingerprints);
-    errcode = OSPPTransactionSetSIPHeader(OSPVTransactionHandle, OSPC_SIPHEADER_IDENTITY, OSPC_NFORMAT_SIP, "IdentityHeader");
+    errcode = OSPPTransactionSetSIPHeader(OSPVTransactionHandle, OSPC_SIPHEADER_IDENTITY, OSPC_NFORMAT_SIP, "IdentityHeader,IdentityHeaderOther");
 
     errcode = OSPPTransactionSetSIPHeader(OSPVTransactionHandle, OSPC_SIPHEADER_IDBYPASS, OSPC_NFORMAT_SIP, "ABCD_0123456789ABCFEF");