Merge pull request #53 from negbie/master

Sync
sipcapture · Jun 16, 2018 · 080e866 · 080e866
2 parents 13b9eab + d973bb0
commit 080e866
Show file tree

Hide file tree

Showing 23 changed files with 26 additions and 790 deletions.
diff --git a/config/config.go b/config/config.go
@@ -1,7 +1,7 @@
 package config
 
 import (
-	"github.com/negbie/heplify/logp"
+	"github.com/negbie/logp"
 )
 
 var Cfg Config

diff --git a/decoder/correlator.go b/decoder/correlator.go
@@ -6,8 +6,8 @@ import (
 	"net"
 	"strconv"
 
-	"github.com/negbie/heplify/logp"
 	"github.com/negbie/heplify/protos"
+	"github.com/negbie/logp"
 )
 
 // cacheSDPIPPort will extract the source IP, source Port from SDP body and CallID from SIP header.

diff --git a/decoder/decoder.go b/decoder/decoder.go
@@ -12,8 +12,8 @@ import (
 	"github.com/google/gopacket/layers"
 	"github.com/negbie/heplify/config"
 	"github.com/negbie/heplify/ip4defrag"
-	"github.com/negbie/heplify/logp"
 	"github.com/negbie/heplify/protos"
+	"github.com/negbie/logp"
 )
 
 type Decoder struct {
@@ -196,7 +196,8 @@ func (d *Decoder) Process(data []byte, ci *gopacket.CaptureInfo) (*Packet, error
 
 			pb, ok := packet.(gopacket.PacketBuilder)
 			if !ok {
-				logp.Critical("Not a PacketBuilder")
+				logp.Err("Not a PacketBuilder")
+				return nil, nil
 			}
 			nextDecoder := ip4New.NextLayerType()
 			nextDecoder.Decode(ip4New.Payload, pb)

diff --git a/decoder/util.go b/decoder/util.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/negbie/heplify/logp"
+	"github.com/negbie/logp"
 )
 
 const fnvBasis = 14695981039346656037

diff --git a/example/sip_ipv4_tcp.pcap b/example/sip_ipv4_tcp.pcap
diff --git a/example/sip_ipv6.pcap → example/sip_ipv6_udp.pcap b/example/sip_ipv6.pcap → example/sip_ipv6_udp.pcap
diff --git a/logp/file_rotator.go b/logp/file_rotator.go