smalltalk
/
osmo-st-sip
Archived
1
0
Fork 0
Code Releases Activity

misc: Use String>>#expandMacrosWith to increase portability

This commit is contained in:
Holger Hans Peter Freyther 2013-03-31 18:48:55 +02:00
parent 33ecc34cb5
commit 90655feda0
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
callagent/SIPCallAgent.st
View File

@ -358,7 +358,8 @@ SIPUserAgentBase subclass: SIPUserAgent [
addParameter: 'From' value: dialog generateTo;
addParameter: 'To' value: dialog generateFrom;
addParameter: 'Call-ID' value: dialog callId;
addParameter: 'CSeq' value: '%1 %2' % {cseq number. cseq method};
addParameter: 'CSeq' value: ('<1p> <2s>'
expandMacrosWith: cseq with: cseq method);
addParameter: 'Allow' value: 'ACK,BYE';
yourself.
self injectDefaults: resp.

12
callagent/SIPTransactions.st
View File

@ -259,7 +259,8 @@ Object subclass: SIPTransaction [
invite := (SIPInviteRequest from: initial_dialog)
sdp: sdp;
addParameter: 'Via' value: (useragent generateVia: branch);
addParameter: 'CSeq' value: '%1 %2' % {cseq. 'INVITE'};
addParameter: 'CSeq' value: ('<1p> <2s>'
expandMacrosWith: cseq with: 'INVITE');
addParameter: 'Allow' value: 'ACK,BYE';
addParameter: 'Call-ID' value: initial_dialog callId;
yourself.
@ -273,7 +274,8 @@ Object subclass: SIPTransaction [
ack := (SIPACKRequest from: aDialog)
addParameter: 'Via' value: (useragent generateVia: aBranch);
addParameter: 'CSeq' value: '%1 %2' % {cseq. 'ACK'};
addParameter: 'CSeq' value: ('<1p> <2s>'
expandMacrosWith: cseq with: 'ACK');
addParameter: 'Call-ID' value: aDialog callId;
yourself.
useragent injectDefaults: ack.
@ -286,7 +288,8 @@ Object subclass: SIPTransaction [
bye := (SIPByeRequest from: aDialog)
addParameter: 'Via' value: (useragent generateVia: branch);
addParameter: 'CSeq' value: '%1 %2' % {cseq. 'BYE'};
addParameter: 'CSeq' value: ('<1p> <2s>'
expandMacrosWith: cseq with: 'BYE');
addParameter: 'Call-ID' value: aDialog callId;
yourself.
useragent injectDefaults: bye.
@ -299,7 +302,8 @@ Object subclass: SIPTransaction [
cancel := (SIPCancelRequest from: initial_dialog)
addParameter: 'Via' value: (useragent generateVia: branch);
addParameter: 'CSeq' value: '%1 %2' % {cseq. 'CANCEL'};
addParameter: 'CSeq' value: ('<1p> <2s>'
expandMacrosWith: cseq with: 'CANCEL');
addParameter: 'Call-ID' value: initial_dialog callId;
yourself.
useragent injectDefaults: cancel.