github/goreplay
4
0
Fork 0
mirror of https://github.com/buger/goreplay.git synced 2024-04-21 12:32:02 +00:00
Code Issues Releases Wiki Activity

Fix MacOS builds

Browse Source
This commit is contained in:
Leonid Bugaev
2021-06-29 23:10:39 +03:00
parent ad43405793
commit f701dace50
3 changed files with 7 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+5 -5
View File
@@ -26,13 +26,13 @@ FPMCOMMON= \
release: release-x64 release-mac release-windows release: release-x64 release-mac release-windows
release-bin: release-bin:
docker run -v `pwd`:$(SOURCE_PATH) -t --env GOOS=linux --env GOARCH=amd64 -i $(CONTAINER) go build -o $(BIN_NAME) -tags netgo $(LDFLAGS) docker run -v `pwd`:$(SOURCE_PATH) -t --env GOOS=linux --env GOARCH=amd64 -i $(CONTAINER) go build -mod=mod -o $(BIN_NAME) -tags netgo $(LDFLAGS)
release-bin-mac: release-bin-mac:
GOOS=darwin go build -o $(BIN_NAME) $(MAC_LDFLAGS) GOOS=darwin go build -o $(BIN_NAME) $(MAC_LDFLAGS)
release-x64: release-x64:
docker run -v `pwd`:$(SOURCE_PATH) -t --env GOOS=linux --env GOARCH=amd64 -i $(CONTAINER) go build -o $(BIN_NAME) -tags netgo $(LDFLAGS) docker run -v `pwd`:$(SOURCE_PATH) -t --env GOOS=linux --env GOARCH=amd64 -i $(CONTAINER) go build -mod=mod -o $(BIN_NAME) -tags netgo $(LDFLAGS)
tar -czf gor_$(VERSION)$(PREFIX)_x64.tar.gz $(BIN_NAME) tar -czf gor_$(VERSION)$(PREFIX)_x64.tar.gz $(BIN_NAME)
mkdir -p /tmp/gor-build mkdir -p /tmp/gor-build
mv ./$(BIN_NAME) /tmp/gor-build/$(BIN_NAME) mv ./$(BIN_NAME) /tmp/gor-build/$(BIN_NAME)
@@ -44,12 +44,12 @@ release-x64:
rm -rf /tmp/gor-build rm -rf /tmp/gor-build
release-x86: release-x86:
docker run -v `pwd`:$(SOURCE_PATH) -t --env GOOS=linux --env GOARCH=386 -i $(CONTAINER) go build -o $(BIN_NAME) -tags netgo $(LDFLAGS) docker run -v `pwd`:$(SOURCE_PATH) -t --env GOOS=linux --env GOARCH=386 -i $(CONTAINER) go build -mod=mod -o $(BIN_NAME) -tags netgo $(LDFLAGS)
tar -czf gor_$(VERSION)$(PREFIX)_x86.tar.gz $(BIN_NAME) tar -czf gor_$(VERSION)$(PREFIX)_x86.tar.gz $(BIN_NAME)
rm $(BIN_NAME) rm $(BIN_NAME)
release-mac: release-mac:
go build -o $(BIN_NAME) $(MAC_LDFLAGS) go build -mod=mod -o $(BIN_NAME) $(MAC_LDFLAGS)
tar -czf gor_$(VERSION)$(PREFIX)_mac.tar.gz $(BIN_NAME) tar -czf gor_$(VERSION)$(PREFIX)_mac.tar.gz $(BIN_NAME)
mkdir -p /tmp/gor-build mkdir -p /tmp/gor-build
mv ./$(BIN_NAME) /tmp/gor-build/$(BIN_NAME) mv ./$(BIN_NAME) /tmp/gor-build/$(BIN_NAME)
@@ -71,7 +71,7 @@ release-windows:
rm -rf ./gor.exe rm -rf ./gor.exe
build: build:
go build -o $(BIN_NAME) $(LDFLAGS) go build -mod=mod -o $(BIN_NAME) $(LDFLAGS)
install: install:
go install $(MAC_LDFLAGS) go install $(MAC_LDFLAGS)
capture/af_packet.go
+2
View File
@@ -1,3 +1,5 @@
// +build !linux
package capture package capture
import ( import (
capture/af_packet_linux.go
-56
View File
@@ -128,59 +128,3 @@ func afpacketComputeSize(targetSizeMb int, snaplen int, pageSize int) (
return frameSize, blockSize, numBlocks, nil return frameSize, blockSize, numBlocks, nil
} }
func main() {
flag.Parse()
if *cpuprofile != "" {
log.Printf("Writing CPU profile to %q", *cpuprofile)
f, err := os.Create(*cpuprofile)
if err != nil {
log.Fatal(err)
}
if err := pprof.StartCPUProfile(f); err != nil {
log.Fatal(err)
}
defer pprof.StopCPUProfile()
}
log.Printf("Starting on interface %q", *iface)
if *snaplen <= 0 {
*snaplen = 65535
}
err = afpacketHandle.SetBPFFilter(*filter, *snaplen)
if err != nil {
log.Fatal(err)
}
source := gopacket.ZeroCopyPacketDataSource(afpacketHandle)
defer afpacketHandle.Close()
bytes := uint64(0)
packets := uint64(0)
for ; *count != 0; *count-- {
data, _, err := source.ZeroCopyReadPacketData()
if err != nil {
log.Fatal(err)
}
bytes += uint64(len(data))
packets++
if *count%*verbose == 0 {
_, afpacketStats, err := afpacketHandle.SocketStats()
if err != nil {
log.Println(err)
}
log.Printf("Read in %d bytes in %d packets", bytes, packets)
log.Printf("Stats {received dropped queue-freeze}: %d", afpacketStats)
}
}
}
func (l *Listener) PcapHandle(ifi pcap.Interface) (handle *pcap.Handle, err error) {
szFrame, szBlock, numBlocks, err := afpacketComputeSize(*bufferSize, *snaplen, os.Getpagesize())
if err != nil {
log.Fatal(err)
}
handle, err = newAfpacketHandle(*ifi, szFrame, szBlock, numBlocks, *addVLAN, pcap.BlockForever)
return afpacketHandle
}