github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-08-01 08:50:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

TRA-4065 fix mizu tapping (#561)

Browse Source 
* Update main.go and passive_tapper.go

* Update main.go
This commit is contained in:
RamiBerm 2021-12-27 15:11:36 +02:00 committed by GitHub
parent 06785ec877
commit 2da7c0f0ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
agent/main.go
View File

@ -441,12 +441,22 @@ func handleIncomingMessageAsTapper(socketConnection *websocket.Conn) {
return return
} }
} else { } else {
var socketMessageBase shared.WebSocketMessageMetadata
if err := json.Unmarshal(message, &socketMessageBase); err != nil {
logger.Log.Errorf("Could not unmarshal websocket message %v", err)
} else {
switch socketMessageBase.MessageType {
case shared.WebSocketMessageTypeTapConfig:
var tapConfigMessage *shared.WebSocketTapConfigMessage var tapConfigMessage *shared.WebSocketTapConfigMessage
if err := json.Unmarshal(message, &tapConfigMessage); err != nil { if err := json.Unmarshal(message, &tapConfigMessage); err != nil {
logger.Log.Errorf("received unknown message from socket connection: %s, err: %s, (%v,%+v)", string(message), err, err, err) logger.Log.Errorf("received unknown message from socket connection: %s, err: %s, (%v,%+v)", string(message), err, err, err)
} else { } else {
tap.UpdateTapTargets(tapConfigMessage.TapTargets) tap.UpdateTapTargets(tapConfigMessage.TapTargets)
} }
default:
logger.Log.Warningf("Received socket message of type %s for which no handlers are defined", socketMessageBase.MessageType)
}
}
} }
} }
} }

3
tap/passive_tapper.go
View File

@ -194,11 +194,12 @@ func startPassiveTapper(opts *TapOpts, outputItems chan *api.OutputChannelItem)
diagnose.InitializeErrorsMap(*debug, *verbose, *quiet) diagnose.InitializeErrorsMap(*debug, *verbose, *quiet)
diagnose.InitializeTapperInternalStats() diagnose.InitializeTapperInternalStats()
mainPacketInputChan = make(chan source.TcpPacketInfo)
if err := initializePacketSources(); err != nil { if err := initializePacketSources(); err != nil {
logger.Log.Fatal(err) logger.Log.Fatal(err)
} }
mainPacketInputChan = make(chan source.TcpPacketInfo)
assembler := NewTcpAssembler(outputItems, streamsMap, opts) assembler := NewTcpAssembler(outputItems, streamsMap, opts)
diagnose.AppStats.SetStartTime(time.Now()) diagnose.AppStats.SetStartTime(time.Now())