From 716dad5d8e6307d5bc6d40f7beb72b30fa9b7c2e Mon Sep 17 00:00:00 2001
From: Justine Alexandra Roberts Tunney <jtunney@gmail.com>
Date: Thu, 8 Jan 2015 16:24:22 -0500
Subject: [PATCH] Use loose signalling and fix trace logging.

---
 sip/dialog.go    | 4 ++--
 sip/receiver.go  | 2 +-
 sip/trace.go     | 6 ++----
 sip/transport.go | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/sip/dialog.go b/sip/dialog.go
index 55521cf..76c2d10 100755
--- a/sip/dialog.go
+++ b/sip/dialog.go
@@ -21,7 +21,7 @@ const (
 )
 
 var (
-	looseSignalling = flag.Bool("looseSignalling", false, "Permit SIP messages from servers other than the next hop.")
+	looseSignalling = flag.Bool("looseSignalling", true, "Permit SIP messages from servers other than the next hop.")
 	resendInterval  = flag.Int("resendInterval", 200, "Milliseconds between SIP resends.")
 	maxResends      = flag.Int("maxResends", 2, "Max SIP message retransmits.")
 )
@@ -388,7 +388,7 @@ func (dls *dialogState) send(msg *Msg) bool {
 	dls.b.Reset()
 	msg.Append(&dls.b)
 	if *tracing {
-		trace("send", dls.b.String(), dls.sock.RemoteAddr(), ts)
+		trace("send", dls.b.String(), dls.sock.RemoteAddr())
 	}
 	_, err := dls.sock.Write(dls.b.Bytes())
 	if err != nil {
diff --git a/sip/receiver.go b/sip/receiver.go
index 0c7ad21..dcb414e 100644
--- a/sip/receiver.go
+++ b/sip/receiver.go
@@ -21,7 +21,7 @@ func ReceiveMessages(sock *net.UDPConn, c chan<- *Msg, e chan<- error) {
 		ts := time.Now()
 		packet := string(buf[0:amt])
 		if *tracing {
-			trace("recv", packet, addr, ts)
+			trace("recv", packet, addr)
 		}
 		msg, err := ParseMsg(packet)
 		if err != nil {
diff --git a/sip/trace.go b/sip/trace.go
index 57fce96..125c65f 100644
--- a/sip/trace.go
+++ b/sip/trace.go
@@ -5,7 +5,6 @@ import (
 	"log"
 	"net"
 	"strings"
-	"time"
 )
 
 var (
@@ -13,7 +12,7 @@ var (
 	timestampTagging = flag.Bool("timestampTagging", false, "Add microsecond timestamps to Via tags")
 )
 
-func trace(dir, pkt string, addr net.Addr, t time.Time) {
+func trace(dir, pkt string, addr net.Addr) {
 	size := len(pkt)
 	bar := strings.Repeat("-", 72)
 	suffix := "\n"
@@ -21,12 +20,11 @@ func trace(dir, pkt string, addr net.Addr, t time.Time) {
 		suffix = ""
 	}
 	log.Printf(
-		"%s %d bytes to %s/%s at %s\n"+
+		"%s %d bytes from %s/%s\n"+
 			"%s\n"+
 			"%s%s"+
 			"%s\n",
 		dir, size, addr.Network(), addr.String(),
-		t.Format(time.RFC3339Nano),
 		bar,
 		pkt, suffix,
 		bar)
diff --git a/sip/transport.go b/sip/transport.go
index 0ed09c1..54410fe 100755
--- a/sip/transport.go
+++ b/sip/transport.go
@@ -73,7 +73,7 @@ func (tp *Transport) Send(msg *Msg) error {
 	var b bytes.Buffer
 	msg.Append(&b)
 	if *tracing {
-		trace("send", b.String(), addr, ts)
+		trace("send", b.String(), addr)
 	}
 	_, err = tp.Sock.WriteTo(b.Bytes(), addr)
 	if err != nil {