run fmt

decode.go

@@ -17,52 +17,50 @@ const (
 	IP_UDP  = 17
 )
 
-
 // port from sf-pcap.c file
 const (
-	TCPDUMP_MAGIC = 0xa1b2c3d4
-	KUZNETZOV_TCPDUMP_MAGIC	= 0xa1b2cd34
-	FMESQUITA_TCPDUMP_MAGIC	= 0xa1b234cd
-	NAVTEL_TCPDUMP_MAGIC = 0xa12b3c4d
-	NSEC_TCPDUMP_MAGIC = 0xa1b23c4d
+	TCPDUMP_MAGIC           = 0xa1b2c3d4
+	KUZNETZOV_TCPDUMP_MAGIC = 0xa1b2cd34
+	FMESQUITA_TCPDUMP_MAGIC = 0xa1b234cd
+	NAVTEL_TCPDUMP_MAGIC    = 0xa12b3c4d
+	NSEC_TCPDUMP_MAGIC      = 0xa1b23c4d
 )
 
-
 /**
  * DLT
  * These are the types that are the same on all platforms, and that
  * have been defined by <net/bpf.h> for ages.
  */
 const (
-	DLT_NULL	= 0	    /* BSD loopback encapsulation */
-	DLT_EN10MB	= 1	    /* Ethernet (10Mb) */
-	DLT_EN3MB	= 2	    /* Experimental Ethernet (3Mb) */
-	DLT_AX25	= 3	    /* Amateur Radio AX.25 */
-	DLT_PRONET	= 4	    /* Proteon ProNET Token Ring */
-	DLT_CHAOS	= 5	    /* Chaos */
-	DLT_IEEE802	= 6	    /* 802.5 Token Ring */
-	DLT_ARCNET	= 7	    /* ARCNET, with BSD-style header */
-	DLT_SLIP	= 8	    /* Serial Line IP */
-	DLT_PPP		= 9	    /* Point-to-point Protocol */
-	DLT_FDDI	= 10	/* FDDI */
+	DLT_NULL    = 0  // BSD loopback encapsulation
+	DLT_EN10MB  = 1  // Ethernet (10Mb)
+	DLT_EN3MB   = 2  // Experimental Ethernet (3Mb)
+	DLT_AX25    = 3  // Amateur Radio AX.25
+	DLT_PRONET  = 4  // Proteon ProNET Token Ring
+	DLT_CHAOS   = 5  // Chaos
+	DLT_IEEE802 = 6  // 802.5 Token Ring
+	DLT_ARCNET  = 7  // ARCNET, with BSD-style header
+	DLT_SLIP    = 8  // Serial Line IP
+	DLT_PPP     = 9  // Point-to-point Protocol
+	DLT_FDDI    = 10 // FDDI
 )
 
 const (
 	ERRBUF_SIZE = 256
 
 	// According to pcap-linktype(7).
-	LINKTYPE_NULL             = DLT_NULL
-	LINKTYPE_ETHERNET         = DLT_EN10MB
-	LINKTYPE_TOKEN_RING       = DLT_IEEE802
-
-	LINKTYPE_EXP_ETHERNET	= DLT_EN3MB	/* 3Mb experimental Ethernet */
-	LINKTYPE_AX25		= DLT_AX25
-	LINKTYPE_PRONET		= DLT_PRONET
-	LINKTYPE_CHAOS		= DLT_CHAOS
-	LINKTYPE_ARCNET_BSD	= DLT_ARCNET	/* BSD-style headers */
-	LINKTYPE_SLIP		= DLT_SLIP
-	LINKTYPE_PPP		= DLT_PPP
-	LINKTYPE_FDDI		= DLT_FDDI
+	LINKTYPE_NULL       = DLT_NULL
+	LINKTYPE_ETHERNET   = DLT_EN10MB
+	LINKTYPE_TOKEN_RING = DLT_IEEE802
+
+	LINKTYPE_EXP_ETHERNET = DLT_EN3MB /* 3Mb experimental Ethernet */
+	LINKTYPE_AX25         = DLT_AX25
+	LINKTYPE_PRONET       = DLT_PRONET
+	LINKTYPE_CHAOS        = DLT_CHAOS
+	LINKTYPE_ARCNET_BSD   = DLT_ARCNET /* BSD-style headers */
+	LINKTYPE_SLIP         = DLT_SLIP
+	LINKTYPE_PPP          = DLT_PPP
+	LINKTYPE_FDDI         = DLT_FDDI
 
 	LINKTYPE_ARCNET           = 7
 	LINKTYPE_ATM_RFC1483      = 100
@@ -103,7 +101,6 @@ func decodemac(pkt []byte) uint64 {
 	return mac
 }
 
-
 // Arphdr is a ARP packet header.
 type Arphdr struct {
 	Addrtype          uint16
@@ -224,7 +221,6 @@ type Udphdr struct {
 	Checksum uint16
 }
 
-
 func (udp *Udphdr) String(hdr addrHdr) string {
 	return fmt.Sprintf("UDP %s:%d > %s:%d LEN=%d CHKSUM=%d",
 		hdr.SrcAddr(), int(udp.SrcPort), hdr.DestAddr(), int(udp.DestPort),
@@ -240,7 +236,6 @@ type Icmphdr struct {
 	Data     []byte
 }
 
-
 func (icmp *Icmphdr) String(hdr addrHdr) string {
 	return fmt.Sprintf("ICMP %s > %s Type = %d Code = %d ",
 		hdr.SrcAddr(), hdr.DestAddr(), icmp.Type, icmp.Code)

io.go

@@ -20,7 +20,7 @@ type FileHeader struct {
 	// NOTE: 'Network' property has been changed to `linktype`
 	// Please see pcap/pcap.h header file.
 	//     Network      uint32
-	LinkType     uint32
+	LinkType uint32
 }
 
 // Reader parses pcap files.
@@ -57,7 +57,7 @@ func NewReader(reader io.Reader) (*Reader, error) {
 		TimeZone:     r.readInt32(),
 		SigFigs:      r.readUint32(),
 		SnapLen:      r.readUint32(),
-		LinkType:      r.readUint32(),
+		LinkType:     r.readUint32(),
 	}
 	return r, nil
 }
@@ -79,7 +79,7 @@ func (r *Reader) Next() *Packet {
 		return nil
 	}
 	return &Packet{
-		Time: time.Unix(int64(timeSec), int64(timeUsec)),
+		Time:   time.Unix(int64(timeSec), int64(timeUsec)),
 		Caplen: capLen,
 		Len:    origLen,
 		Data:   data,

packet.go

@@ -1,11 +1,11 @@
 package pcap
 
 import (
-	"time"
 	"encoding/binary"
-	"reflect"
 	"fmt"
+	"reflect"
 	"strings"
+	"time"
 )
 
 type PacketTime struct {
@@ -20,7 +20,7 @@ type Packet struct {
 	Caplen uint32    // bytes stored in the file (caplen <= len)
 	Len    uint32    // bytes sent/received
 
-	Data   []byte    // packet data
+	Data []byte // packet data
 
 	Type    int // protocol type, see LINKTYPE_*
 	DestMac uint64
@@ -82,7 +82,6 @@ func (p *Packet) headerString(headers []interface{}) string {
 	return fmt.Sprintf("unknown [%s]", strings.Join(typeNames, ","))
 }
 
-
 // String prints a one-line representation of the packet header.
 // The output is suitable for use in a tcpdump program.
 func (p *Packet) String() string {
@@ -110,7 +109,6 @@ func (p *Packet) decodeArp() {
 	p.Payload = p.Payload[8+2*arp.HwAddressSize+2*arp.ProtAddressSize:]
 }
 
-
 func (p *Packet) decodeIp() {
 	pkt := p.Payload
 	ip := new(Iphdr)
@@ -147,7 +145,6 @@ func (p *Packet) decodeIp() {
 	}
 }
 
-
 func (p *Packet) decodeTcp() {
 	pkt := p.Payload
 	tcp := new(Tcphdr)
@@ -164,7 +161,6 @@ func (p *Packet) decodeTcp() {
 	p.Headers = append(p.Headers, tcp)
 }
 
-
 func (p *Packet) decodeUdp() {
 	pkt := p.Payload
 	udp := new(Udphdr)

pcap.go

@@ -16,8 +16,8 @@ import (
 	"errors"
 	"net"
 	"syscall"
-	"unsafe"
 	"time"
+	"unsafe"
 )
 
 type Pcap struct {