neale
/
netshovel
mirror of https://github.com/dirtbags/netshovel.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

go fmt

This commit is contained in:
Neale Pickett 2018-07-24 23:53:06 +00:00
parent a860c7f069
commit d06ca08456
5 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gapstring/gapstring.go
View File

@ -14,8 +14,8 @@ package gapstring
import ( import (
"bytes" "bytes"
"fmt"
"encoding/binary" "encoding/binary"
"fmt"
"strings" "strings"
"unicode/utf16" "unicode/utf16"
) )
@ -298,7 +298,7 @@ func (g GapString) Hexdump() string {
glen := g.Length() glen := g.Length()
pos := 0 pos := 0
prev := []byte{} prev := []byte{}
for ; pos < glen; { for pos < glen {
// Check for repeats // Check for repeats
end := pos + 16 end := pos + 16
if end > glen { if end > glen {
@ -361,4 +361,3 @@ func (g GapString) Utf16LE(gap string) string {
func (g GapString) Utf16BE(gap string) string { func (g GapString) Utf16BE(gap string) string {
return g.Utf16(binary.BigEndian, gap) return g.Utf16(binary.BigEndian, gap)
} }

2
netshovel.go
View File

@ -10,11 +10,11 @@ package netshovel
import ( import (
"flag" "flag"
"log"
"github.com/google/gopacket" "github.com/google/gopacket"
"github.com/google/gopacket/layers" "github.com/google/gopacket/layers"
"github.com/google/gopacket/pcap" "github.com/google/gopacket/pcap"
"github.com/google/gopacket/tcpassembly" "github.com/google/gopacket/tcpassembly"
"log"
) )
// Mainloop to handle dispatching of PCAP files from command line // Mainloop to handle dispatching of PCAP files from command line

7
packet.go
View File

@ -4,9 +4,9 @@ import (
"encoding/binary" "encoding/binary"
"encoding/hex" "encoding/hex"
"fmt" "fmt"
"github.com/dirtbags/netshovel/gapstring"
"strings" "strings"
"time" "time"
"github.com/dirtbags/netshovel/gapstring"
) )
// Error returned by convenience methods that are unable to get enough data // Error returned by convenience methods that are unable to get enough data
@ -14,6 +14,7 @@ type ShortError struct {
Wanted int // How many bytes you needed Wanted int // How many bytes you needed
Available int // How many bytes were available Available int // How many bytes were available
} }
func (e *ShortError) Error() string { func (e *ShortError) Error() string {
return fmt.Sprintf("Short read: wanted %d of %d available", e.wanted, e.available) return fmt.Sprintf("Short read: wanted %d of %d available", e.wanted, e.available)
} }
@ -21,6 +22,7 @@ func (e *ShortError) Error() string {
// Error returned by convenience methods that are unable to operate on gaps in data // Error returned by convenience methods that are unable to operate on gaps in data
type MissingError struct { type MissingError struct {
} }
func (e *MissingError) Error() string { func (e *MissingError) Error() string {
return "Operation on missing bytes" return "Operation on missing bytes"
} }
@ -81,7 +83,7 @@ func (pkt *Packet) Describe() string {
pkt.Description, pkt.Description,
) )
for _, f := range(pkt.Fields) { for _, f := range pkt.Fields {
fmt.Fprintf(out, " %s: %s\n", f.key, f.value) fmt.Fprintf(out, " %s: %s\n", f.key, f.value)
} }
fmt.Fprint(out, pkt.Payload.Hexdump()) fmt.Fprint(out, pkt.Payload.Hexdump())
@ -248,4 +250,3 @@ func (pkt *Packet) Uint8(name string) (uint8, error) {
} }
return value.(uint8), err return value.(uint8), err
} }

10
stream.go
View File

@ -2,14 +2,14 @@ package netshovel
import ( import (
"fmt" "fmt"
"io"
"os"
"net/url"
"strings"
"time"
"github.com/dirtbags/netshovel/gapstring" "github.com/dirtbags/netshovel/gapstring"
"github.com/google/gopacket" "github.com/google/gopacket"
"github.com/google/gopacket/tcpassembly" "github.com/google/gopacket/tcpassembly"
"io"
"net/url"
"os"
"strings"
"time"
) )
// A File and the path where it lives // A File and the path where it lives