Skip to content

Commit 37e4c1b

Browse files
Applied changes according to PR comments
Added transport for the SIP registrar Misc changes based on discussions or comments made from F2F
1 parent 8920c12 commit 37e4c1b

2 files changed

Lines changed: 28 additions & 10 deletions

File tree

doc/Sip.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
<variablelist>
203203
<varlistentry>
204204
<term>Registrar</term>
205-
<listitem><para>One or more SIP registrar URIs. The registar shall be an absolute URI without scheme, such as: my.domain:port/p/a/t/h?query</para></listitem>
205+
<listitem><para>One or more SIP registrar entries. Each entry contains a Uri and a Transport field. The Uri shall be an absolute URI without scheme, such as: my.domain:port/p/a/t/h?query. The Transport field specifies the transport protocol to use for the registrar and shall be one of: UDP, TCP, or TLS.</para></listitem>
206206
</varlistentry>
207207
<varlistentry>
208208
<term>UserId</term>
@@ -307,7 +307,7 @@
307307
</varlistentry>
308308
<varlistentry>
309309
<term>Turn</term>
310-
<listitem><para>Optional, unbounded. Each entry contains a TURN server URI and optional credentials (Username and Password) used to authenticate with the TURN server. The device shall not return the password in the response.</para></listitem>
310+
<listitem><para>Optional, unbounded. Each entry contains one or more TURN server URIs and optional credentials (Username and Password) used to authenticate with the TURN server. The device shall not return the password in the response.</para></listitem>
311311
</varlistentry>
312312
</variablelist>
313313
<section xml:id="_Toc_GetNatConfiguration">
@@ -393,8 +393,8 @@
393393
<varlistentry>
394394
<term>response</term>
395395
<listitem>
396-
<para role="param">CallConfiguration - optional [tsip:CallConfiguration]</para>
397-
<para role="text">The current call configuration of the device. Absent if no call configuration has been set.</para>
396+
<para role="param">CallConfiguration [tsip:CallConfiguration]</para>
397+
<para role="text">The current call configuration of the device.</para>
398398
</listitem>
399399
</varlistentry>
400400
<varlistentry>
@@ -413,13 +413,13 @@
413413
</section>
414414
<section xml:id="_Toc_SetCallConfiguration">
415415
<title>SetCallConfiguration</title>
416-
<para>This operation sets the call configuration of the device. The number of recipients shall not exceed the value indicated by the MaximumRecipients SIP capability. The Order field of each recipient shall be between 1 and the MaximumRecipients capability value, inclusive. If the configuration is absent, the device shall remove the existing call configuration.</para>
416+
<para>This operation sets the call configuration of the device. The number of recipients shall not exceed the value indicated by the MaximumRecipients SIP capability. The Order field of each recipient shall be between 1 and the MaximumRecipients capability value, inclusive.</para>
417417
<variablelist role="op">
418418
<varlistentry>
419419
<term>request</term>
420420
<listitem>
421-
<para role="param">CallConfiguration - optional [tsip:CallConfiguration]</para>
422-
<para role="text">The call configuration to set on the device. If absent, the device shall remove the existing call configuration.</para>
421+
<para role="param">CallConfiguration [tsip:CallConfiguration]</para>
422+
<para role="text">The call configuration to set on the device. Only one call configuration is supported.</para>
423423
</listitem>
424424
</varlistentry>
425425
<varlistentry>

wsdl/ver10/sip/wsdl/sip.wsdl

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,27 @@ IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FO
7070
</xs:element>
7171
</xs:sequence>
7272
</xs:complexType>
73+
<xs:complexType name="Registrar">
74+
<xs:sequence>
75+
<xs:element name="Uri" type="xs:anyURI" minOccurs="1" maxOccurs="1"/>
76+
<xs:element name="Transport" type="xs:string" minOccurs="1" maxOccurs="1">
77+
<xs:annotation>
78+
<xs:documentation>Transport protocol to use for the registrar. Valid values are defined in tsip:TransportType.</xs:documentation>
79+
</xs:annotation>
80+
</xs:element>
81+
</xs:sequence>
82+
</xs:complexType>
83+
<xs:simpleType name="TransportType">
84+
<xs:restriction base="xs:string">
85+
<xs:enumeration value="UDP"/>
86+
<xs:enumeration value="TCP"/>
87+
<xs:enumeration value="TLS"/>
88+
</xs:restriction>
89+
</xs:simpleType>
7390
<!--===============================-->
7491
<xs:complexType name="ServerConfiguration">
7592
<xs:sequence>
76-
<xs:element name="Registrar" type="xs:anyURI" minOccurs="1" maxOccurs="unbounded"/>
93+
<xs:element name="Registrar" type="tsip:Registrar" minOccurs="1" maxOccurs="unbounded"/>
7794
<xs:element name="UserId" type="xs:string">
7895
<xs:annotation>
7996
<xs:documentation>The user info/extension of the Address of Record (AoR) in SIP, identifying the user on the registrar.</xs:documentation>
@@ -91,7 +108,8 @@ IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FO
91108
<xs:element name="Credential" type="tsip:BasicCredential" minOccurs="0" maxOccurs="1"/>
92109
<xs:element name="AuthorizationServer" type="tt:ReferenceToken" minOccurs="0" maxOccurs="1">
93110
<xs:annotation>
94-
<xs:documentation>AuthorizationServer token referring to the server that provides access tokens to authorize with the renewal endpoint.</xs:documentation>
111+
<xs:documentation>AuthorizationServer token referring to the server that provides access tokens to authorize with the
112+
renewal endpoint as defined in the Security specification.</xs:documentation>
95113
</xs:annotation>
96114
</xs:element>
97115
</xs:sequence>
@@ -511,7 +529,7 @@ IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FO
511529
<wsdl:output message="tsip:GetStreamingConfigurationResponse"/>
512530
</wsdl:operation>
513531
<wsdl:operation name="SetStreamingConfiguration">
514-
<wsdl:documentation>This operation sets the SIP streaming configuration of the device. If the configuration is absent, the device shall remove the existing SIP streaming configuration.</wsdl:documentation>
532+
<wsdl:documentation>This operation sets the SIP streaming configuration of the device.</wsdl:documentation>
515533
<wsdl:input message="tsip:SetStreamingConfigurationRequest"/>
516534
<wsdl:output message="tsip:SetStreamingConfigurationResponse"/>
517535
</wsdl:operation>

0 commit comments

Comments
 (0)