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

misc: Use instance variables and use token more directly 

Instead of using auth_param_name which returns token, just use
the token for now. We don't make use of the specific rules in
the SIPParser so there is no used.
This commit is contained in:
Holger Hans Peter Freyther 2014-09-05 14:25:18 +02:00
parent 07e36f8333
commit bd38b0d0af
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
grammar/SIPGrammar.st
View File

@ -24,7 +24,7 @@ PP.PPCompositeParser subclass: SIPGrammar [
extension_header header_name header_value
Request RequestLine Method extension_method
RequestURI quoted_string token commonUriParser paramchar
header
header generic_param tag_param digest_cln auth_param host
|
"http://sofia-sip.org/repos/sofia-sip/libsofia-sip-ua/sip/GRAMMAR"
<category: 'OsmoSIP-Grammar'>
@ -85,7 +85,7 @@ PP.PPCompositeParser subclass: SIPGrammar [
hostport [
<category: 'generic'>
^ self host, ($: asParser, self port) optional
^ host, ($: asParser, self port) optional
]
host [
@ -293,7 +293,7 @@ PP.PPCompositeParser subclass: SIPGrammar [
via_maddr [
<category: 'via'>
^ 'maadr' asParser, EQUAL, self host
^ 'maadr' asParser, EQUAL, host
]
via_received [
@ -309,7 +309,7 @@ PP.PPCompositeParser subclass: SIPGrammar [
via_extension [
<category: 'via'>
^ self generic_param
^generic_param
]
response_port [
@ -331,7 +331,7 @@ PP.PPCompositeParser subclass: SIPGrammar [
CSeq [
<category: 'cseq'>
^ 'CSeq' asParser, HCOLON, (#digit asParser plus flatten, LWS, self Method)
^ 'CSeq' asParser, HCOLON, (#digit asParser plus flatten, LWS, Method)
]
generic_param [
@ -341,7 +341,7 @@ PP.PPCompositeParser subclass: SIPGrammar [
gen_value [
<category: 'generic'>
^token / self host / quoted_string
^token / host / quoted_string
]
quoted_string [
@ -378,7 +378,7 @@ PP.PPCompositeParser subclass: SIPGrammar [
sent_by [
<category: 'via'>
^ self host, (COLON, self port) optional
^ host, (COLON, self port) optional
]
protocol_name [
@ -414,7 +414,7 @@ PP.PPCompositeParser subclass: SIPGrammar [
from_param [
<category: 'from'>
^ self tag_param / self generic_param
^tag_param / generic_param
]
To [
@ -431,7 +431,7 @@ PP.PPCompositeParser subclass: SIPGrammar [
to_param [
<category: 'to'>
^ self tag_param / self generic_param
^tag_param / generic_param
]
tag_param [
@ -441,7 +441,7 @@ PP.PPCompositeParser subclass: SIPGrammar [
name_addr [
<category: 'to-from'>
^ self display_name optional, LAQUOT, self addr_spec, self RAQUOT
^ self display_name optional, LAQUOT, self addr_spec, RAQUOT
]
display_name [
@ -480,7 +480,7 @@ PP.PPCompositeParser subclass: SIPGrammar [
<category: 'WWW-Authenticate'>
^self username / self realm / self nonce / self digest_uri /
self dresponse / self algorithm / self cnonce / self opaque /
self message_qop / self nonce_count / self auth_param
self message_qop / self nonce_count / auth_param
]
username [
@ -537,7 +537,7 @@ PP.PPCompositeParser subclass: SIPGrammar [
digest_cln [
<category: 'WWW-Authenticate'>
^self realm / self domain / self nonce / self opaque /
self stale / self algorithm / self qop_options / self auth_param
self stale / self algorithm / self qop_options / auth_param
]
other_challenge [
@ -599,17 +599,13 @@ PP.PPCompositeParser subclass: SIPGrammar [
auth_param [
<category: 'WWW-Authenticate'>
^self auth_param_name, EQUAL, (token / quoted_string)
]
auth_param_name [
<category: 'WWW-Authenticate'>
^token
"think of auth_param_name here instead of token"
^token, EQUAL, (token / quoted_string)
]
other_response [
<category: 'WWW-Authenticate'>
^self auth_scheme, LWS, self auth_param, (COMMA, self auth_param) plus
^self auth_scheme, LWS, auth_param, (COMMA, auth_param) plus
]
auth_scheme [
@ -649,7 +645,7 @@ PP.PPCompositeParser subclass: SIPGrammar [
contact_extension [
<category: 'contact'>
^ self generic_param
^generic_param
]
delta_seconds [