Merge pull request #432 from jesusprubio/main

ParseTransport and ParseMethod helpers (SIP)

Author: j-baines

protocol/sip/helper.go

@@ -499,6 +499,7 @@ func NewDefaultInviteBody(host, sessid, sessver string) string {
 	if sessver == "" {
 		sessver = random.RandDigits(6)
 	}
+
 	return fmt.Sprintf(`v=0
 o=caller %s %s IN IP4 %s
 s=-
@@ -524,6 +525,7 @@ func NewDefaultPublishBody(id, status, entity string) string {
 	if entity == "" {
 		entity = fmt.Sprintf("sip:bob@%s:5060", random.RandIPv4())
 	}
+
 	return fmt.Sprintf(`<?xml version="1.0" encoding="UTF-8"?>
 <presence xmlns="urn:ietf:params:xml:ns:pidf"
 					entity="%s">
@@ -555,6 +557,7 @@ func NewDefaultNotifyBody(id, status, contact, ts string) string {
 	if ts == "" {
 		ts = time.Now().UTC().Format(time.RFC3339)
 	}
+
 	return fmt.Sprintf(`<?xml version="1.0"?>
 <presence xmlns="urn:ietf:params:xml:ns:pidf">
 	<tuple id="%s">
@@ -566,3 +569,53 @@ func NewDefaultNotifyBody(id, status, contact, ts string) string {
 	</tuple>
 </presence>`, id, status, contact, ts)
 }
+
+// Converts a string to 'TransportType'.
+func ParseTransport(transport string) TransportType {
+	switch strings.ToLower(transport) {
+	case "udp":
+		return UDP
+	case "tcp":
+		return TCP
+	case "tls":
+		return TLS
+	default:
+		return UNKNOWN
+	}
+}
+
+// Converts a string to a 'sip.RequestMethod'.
+func ParseMethod(method string) sip.RequestMethod {
+	switch strings.ToLower(method) {
+	case "options":
+		return sip.OPTIONS
+	case "invite":
+		return sip.INVITE
+	case "register":
+		return sip.REGISTER
+	case "ack":
+		return sip.ACK
+	case "bye":
+		return sip.BYE
+	case "cancel":
+		return sip.CANCEL
+	case "subscribe":
+		return sip.SUBSCRIBE
+	case "notify":
+		return sip.NOTIFY
+	case "publish":
+		return sip.PUBLISH
+	case "refer":
+		return sip.REFER
+	case "info":
+		return sip.INFO
+	case "message":
+		return sip.MESSAGE
+	case "prack":
+		return sip.PRACK
+	case "update":
+		return sip.UPDATE
+	default:
+		return ""
+	}
+}

protocol/sip/helper_test.go

@@ -809,3 +809,58 @@ func TestNewDefaultNotifyBody(t *testing.T) {
 		}
 	})
 }
+
+func TestParseTransport(t *testing.T) {
+	tests := []struct {
+		input    string
+		expected TransportType
+	}{
+		{"UDP", UDP},
+		{"udp", UDP},
+		{"TCP", TCP},
+		{"TLS", TLS},
+		{"invalid", UNKNOWN},
+		{"", UNKNOWN},
+	}
+	for _, tt := range tests {
+		t.Run(tt.input, func(t *testing.T) {
+			result := ParseTransport(tt.input)
+			if result != tt.expected {
+				t.Fatalf("got %s, want %s", result, tt.expected)
+			}
+		})
+	}
+}
+
+func TestParseMethod(t *testing.T) {
+	tests := []struct {
+		input    string
+		expected sip.RequestMethod
+	}{
+		{"INVITE", sip.INVITE},
+		{"invite", sip.INVITE},
+		{"ACK", sip.ACK},
+		{"BYE", sip.BYE},
+		{"CANCEL", sip.CANCEL},
+		{"REGISTER", sip.REGISTER},
+		{"OPTIONS", sip.OPTIONS},
+		{"SUBSCRIBE", sip.SUBSCRIBE},
+		{"NOTIFY", sip.NOTIFY},
+		{"REFER", sip.REFER},
+		{"PUBLISH", sip.PUBLISH},
+		{"MESSAGE", sip.MESSAGE},
+		{"INFO", sip.INFO},
+		{"PRACK", sip.PRACK},
+		{"UPDATE", sip.UPDATE},
+		{"invalid", ""},
+		{"", ""},
+	}
+	for _, tt := range tests {
+		t.Run(tt.input, func(t *testing.T) {
+			result := ParseMethod(tt.input)
+			if result != tt.expected {
+				t.Fatalf("got %s, want %s", result, tt.expected)
+			}
+		})
+	}
+}

random/random.go

@@ -158,5 +158,6 @@ func RandIPv6() net.IP {
 	for i := range net.IPv6len {
 		ip[i] = byte(RandIntRange(1, 256))
 	}
+
 	return ip
 }