Justine Alexandra Roberts Tunney
11 years ago
11 changed files with 961 additions and 578 deletions
Split View
Diff Options
-
+1 -1sip/addr.go
-
+86 -72sip/addr_parse.go
-
+3 -2sip/addr_parse.rl
-
+106 -8sip/addr_test.go
-
+75 -0sip/charsets.go
-
+506 -481sip/msg_parse.go
-
+34 -9sip/msg_parse.rl
-
+3 -3sip/msg_test.go
-
+59 -0sip/quote.go
-
+65 -0sip/quote_test.go
-
+23 -2sip/uri.go
+ 1
- 1
sip/addr.go
View File
+ 86
- 72
sip/addr_parse.go
View File
+ 3
- 2
sip/addr_parse.rl
View File
+ 106
- 8
sip/addr_test.go
View File
+ 75
- 0
sip/charsets.go
View File
| @ -0,0 +1,75 @@ | |||
| // Charset implementation using four int64 bitmasks | |||
| // | |||
| // Each charset mask is 32 bytes, which fits into a 64 byte cache line. | |||
| package sip | |||
| var tokencMask [4]uint64 | |||
| var qdtextcMask [4]uint64 | |||
| func init() { | |||
| charsetAddRange(&tokencMask, 'a', 'z') | |||
| charsetAddRange(&tokencMask, 'A', 'Z') | |||
| charsetAddRange(&tokencMask, '0', '9') | |||
| charsetAdd(&tokencMask, '-') | |||
| charsetAdd(&tokencMask, '.') | |||
| charsetAdd(&tokencMask, '!') | |||
| charsetAdd(&tokencMask, '%') | |||
| charsetAdd(&tokencMask, '*') | |||
| charsetAdd(&tokencMask, '_') | |||
| charsetAdd(&tokencMask, '+') | |||
| charsetAdd(&tokencMask, '`') | |||
| charsetAdd(&tokencMask, '\'') | |||
| charsetAdd(&tokencMask, '~') | |||
| charsetAdd(&qdtextcMask, '\r') | |||
| charsetAdd(&qdtextcMask, '\n') | |||
| charsetAdd(&qdtextcMask, '\t') | |||
| charsetAdd(&qdtextcMask, ' ') | |||
| charsetAdd(&qdtextcMask, '!') | |||
| charsetAddRange(&qdtextcMask, 0x23, 0x5B) | |||
| charsetAddRange(&qdtextcMask, 0x5D, 0x7E) | |||
| } | |||
| func tokenc(c byte) bool { | |||
| return charsetContains(&tokencMask, c) | |||
| } | |||
| func qdtextc(c byte) bool { | |||
| return charsetContains(&qdtextcMask, c) | |||
| } | |||
| func qdtextesc(c byte) bool { | |||
| return 0x00 <= c && c <= 0x09 || | |||
| 0x0B <= c && c <= 0x0C || | |||
| 0x0E <= c && c <= 0x7F | |||
| } | |||
| func charsetContains(mask *[4]uint64, i byte) bool { | |||
| return mask[i/64]&(1<<(i%64)) != 0 | |||
| } | |||
| func charsetAdd(mask *[4]uint64, i byte) { | |||
| mask[i/64] |= 1 << (i % 64) | |||
| } | |||
| func charsetAddRange(mask *[4]uint64, a, b byte) { | |||
| for i := a; i <= b; i++ { | |||
| charsetAdd(mask, i) | |||
| } | |||
| // var m uint64 | |||
| // i := a | |||
| // j := i / 64 | |||
| // for i <= b { | |||
| // m &= 1 << (i % 64) | |||
| // i++ | |||
| // if i%64 == 0 { | |||
| // mask[j] &= m | |||
| // j = i / 64 | |||
| // m = 0 | |||
| // } | |||
| // } | |||
| // if m != 0 { | |||
| // mask[j] |= m | |||
| // } | |||
| } | |||
+ 506
- 481
sip/msg_parse.go
File diff suppressed because it is too large
View File
+ 34
- 9
sip/msg_parse.rl
View File
+ 3
- 3
sip/msg_test.go
View File
+ 59
- 0
sip/quote.go
View File
| @ -0,0 +1,59 @@ | |||
| package sip | |||
| import ( | |||
| "bytes" | |||
| ) | |||
| // tokencify removes all characters that aren't tokenc. | |||
| func tokencify(s []byte) []byte { | |||
| t := make([]byte, len(s)) | |||
| j := 0 | |||
| l := 0 | |||
| for i := 0; i < len(s); i++ { | |||
| if tokenc(s[i]) { | |||
| t[j] = s[i] | |||
| j++ | |||
| l++ | |||
| } | |||
| } | |||
| return t[:l] | |||
| } | |||
| // quote formats an address parameter value or display name. | |||
| // | |||
| // Quotation marks are only added if necessary. This implementation will | |||
| // truncate on input error. | |||
| func quote(s []byte) []byte { | |||
| for i := 0; i < len(s); i++ { | |||
| if !tokenc(s[i]) && s[i] != ' ' { | |||
| return quoteQuoted(s) | |||
| } | |||
| } | |||
| return s | |||
| } | |||
| // quoteQuoted formats an address parameter value or display name with quotes. | |||
| // | |||
| // This implementation will truncate on input error. | |||
| func quoteQuoted(s []byte) []byte { | |||
| var b bytes.Buffer | |||
| b.WriteByte('"') | |||
| for i := 0; i < len(s); i++ { | |||
| if qdtextc(s[i]) { | |||
| if s[i] == '\r' { | |||
| if i+2 >= len(s) || s[i+1] != '\n' || | |||
| !(s[i+2] == ' ' || s[i+2] == '\t') { | |||
| break | |||
| } | |||
| } | |||
| } else { | |||
| if !qdtextesc(s[i]) { | |||
| break | |||
| } | |||
| b.WriteByte('\\') | |||
| } | |||
| b.WriteByte(s[i]) | |||
| } | |||
| b.WriteByte('"') | |||
| return b.Bytes() | |||
| } | |||
+ 65
- 0
sip/quote_test.go
View File
| @ -0,0 +1,65 @@ | |||
| package sip | |||
| import ( | |||
| "testing" | |||
| ) | |||
| type quoteTest struct { | |||
| name string | |||
| in string | |||
| out string | |||
| } | |||
| var quoteTests = []quoteTest{ | |||
| quoteTest{ | |||
| name: "Normal value", | |||
| in: "hello", | |||
| out: "hello", | |||
| }, | |||
| quoteTest{ | |||
| name: "Space doesn't quotes", | |||
| in: "hello there", | |||
| out: "hello there", | |||
| }, | |||
| quoteTest{ | |||
| name: "Less than adds quotes", | |||
| in: "hello there<", | |||
| out: "\"hello there<\"", | |||
| }, | |||
| quoteTest{ | |||
| name: "CRLF with space after works", | |||
| in: "hello\r\n there!", | |||
| out: "\"hello\r\n there!\"", | |||
| }, | |||
| quoteTest{ | |||
| name: "CRLF without space truncates", | |||
| in: "hello\r\nthere!", | |||
| out: "\"hello\"", | |||
| }, | |||
| quoteTest{ | |||
| name: "Escapable character escapes", | |||
| in: "hello\"there", | |||
| out: "\"hello\\\"there\"", | |||
| }, | |||
| quoteTest{ | |||
| name: "Unescapable character truncates", | |||
| in: "hello\xFFthere", | |||
| out: "\"hello\"", | |||
| }, | |||
| } | |||
| func TestQuote(t *testing.T) { | |||
| for _, test := range quoteTests { | |||
| out := string(quote([]byte(test.in))) | |||
| if test.out != out { | |||
| t.Error(test.name, test.out, "!=", out) | |||
| } | |||
| } | |||
| } | |||