MigrateRepos/OpenGFW
1
0
Fork 0
mirror of https://github.com/apernet/OpenGFW.git synced 2024-12-23 01:19:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

rebase and remove replayDelay

Browse Source
This commit is contained in:
eddc005 2024-05-06 23:04:54 +01:00
parent 94387450cf
commit f01b79e625
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/root.go
View File

@ -137,7 +137,6 @@ func initConfig() {
} }
viper.SetDefault("replay.realtime", true) viper.SetDefault("replay.realtime", true)
viper.SetDefault("replay.replayDelay", 10 * time.Millisecond)
} }
func initLogger() { func initLogger() {
@ -185,7 +184,6 @@ type cliConfigIO struct {
type cliConfigReplay struct { type cliConfigReplay struct {
Realtime bool `mapstructure:"realtime"` Realtime bool `mapstructure:"realtime"`
ReplayDelay time.Duration `mapstructure:"replayDelay"`
} }
type cliConfigWorkers struct { type cliConfigWorkers struct {
@ -216,7 +214,6 @@ func (c *cliConfig) fillIO(config *engine.Config) error {
ioImpl, err = io.NewPcapPacketIO(io.PcapPacketIOConfig{ ioImpl, err = io.NewPcapPacketIO(io.PcapPacketIOConfig{
PcapFile: pcapFile, PcapFile: pcapFile,
Realtime: c.Replay.Realtime, Realtime: c.Replay.Realtime,
ReplayDelay: c.Replay.ReplayDelay,
}) })
} else { } else {
// Setup IO for nfqueue // Setup IO for nfqueue

12
io/pcap.go
View File

@ -24,7 +24,6 @@ type pcapPacketIO struct {
type PcapPacketIOConfig struct { type PcapPacketIOConfig struct {
PcapFile string PcapFile string
Realtime bool Realtime bool
ReplayDelay time.Duration
} }
func NewPcapPacketIO(config PcapPacketIOConfig) (PacketIO, error) { func NewPcapPacketIO(config PcapPacketIOConfig) (PacketIO, error) {
@ -34,8 +33,6 @@ func NewPcapPacketIO(config PcapPacketIOConfig) (PacketIO, error) {
return nil, err return nil, err
} }
print(config.ReplayDelay)
return &pcapPacketIO{ return &pcapPacketIO{
pcap: handle, pcap: handle,
lastTime: nil, lastTime: nil,
@ -59,6 +56,7 @@ func (p *pcapPacketIO) Register(ctx context.Context, cb PacketCallback) error {
cb(&pcapPacket{ cb(&pcapPacket{
streamID: id, streamID: id,
timestamp: packet.Metadata().Timestamp,
data: packet.LinkLayer().LayerPayload(), data: packet.LinkLayer().LayerPayload(),
}, nil) }, nil)
} }
@ -91,10 +89,8 @@ func (p *pcapPacketIO) Close() error {
// Intentionally slow down the replay // Intentionally slow down the replay
// In realtime mode, this is to match the timestamps in the capture // In realtime mode, this is to match the timestamps in the capture
// In non realtime mode, this helps to avoid flooding the workers
func (p *pcapPacketIO) wait(packet gopacket.Packet) error { func (p *pcapPacketIO) wait(packet gopacket.Packet) error {
if !p.config.Realtime { if !p.config.Realtime {
time.Sleep(p.config.ReplayDelay)
return nil return nil
} }
@ -113,6 +109,7 @@ var _ Packet = (*pcapPacket)(nil)
type pcapPacket struct { type pcapPacket struct {
streamID uint32 streamID uint32
timestamp time.Time
data []byte data []byte
} }
@ -120,7 +117,10 @@ func (p *pcapPacket) StreamID() uint32 {
return p.streamID return p.streamID
} }
func (p *pcapPacket) Timestamp() time.Time {
return p.timestamp
}
func (p *pcapPacket) Data() []byte { func (p *pcapPacket) Data() []byte {
return p.data return p.data
} }