update: use route header to set dstination

sip/message.go

@@ -111,8 +111,6 @@ type Message interface {
 	SetSource(src string)
 	Destination() string
 	SetDestination(dest string)
-	Proxy() string
-	SetProxy(proxy string)
 
 	IsCancel() bool
 	IsAck() bool
@@ -417,7 +415,6 @@ type message struct {
 	startLine  func() string
 	tp         string
 	src        string
-	proxy      string
 	dest       string
 	fields     log.Fields
 }
@@ -526,18 +523,6 @@ func (msg *message) SetDestination(dest string) {
 	msg.mu.Unlock()
 }
 
-func (msg *message) Proxy() string {
-	msg.mu.RLock()
-	defer msg.mu.RUnlock()
-	return msg.proxy
-}
-
-func (msg *message) SetProxy(proxy string) {
-	msg.mu.Lock()
-	msg.proxy = proxy
-	msg.mu.Unlock()
-}
-
 // Copy all headers of one type from one message to another.
 // Appending to any headers that were already there.
 func CopyHeaders(name string, from, to Message) {

sip/request.go

@@ -224,23 +224,20 @@ func (req *request) Source() string {
 	return fmt.Sprintf("%v:%v", host, port)
 }
 
-func (req *request) Proxy() string {
-	return req.message.Proxy()
-}
-
 func (req *request) Destination() string {
-	if dest := req.message.Destination(); dest != "" {
-		return dest
-	}
-
 	var uri *SipUri
 	if hdrs := req.GetHeaders("Route"); len(hdrs) > 0 {
 		routeHeader, ok := hdrs[0].(*RouteHeader)
 		if ok && len(routeHeader.Addresses) > 0 {
 			uri = routeHeader.Addresses[0].(*SipUri)
 		}
 	}
+
 	if uri == nil {
+		if dest := req.message.Destination(); dest != "" {
+			return dest
+		}
+
 		if u, ok := req.Recipient().(*SipUri); ok {
 			uri = u
 		} else {

transport/layer.go

@@ -256,13 +256,7 @@ func (tpl *layer) Send(msg sip.Message) error {
 			}
 		}
 
-		var dest string
-
-		if msg.Proxy() != "" {
-			dest = msg.Proxy()
-		} else {
-			dest = msg.Destination()
-		}
+		dest := msg.Destination()
 
 		target, err := NewTargetFromAddr(dest)
 		if err != nil {
@@ -323,13 +317,7 @@ func (tpl *layer) Send(msg sip.Message) error {
 			return UnsupportedProtocolError(fmt.Sprintf("protocol %s is not supported", viaHop.Transport))
 		}
 
-		var dest string
-
-		if msg.Proxy() != "" {
-			dest = msg.Proxy()
-		} else {
-			dest = msg.Destination()
-		}
+		dest := msg.Destination()
 
 		target, err := NewTargetFromAddr(dest)
 		if err != nil {