@@ -131,7 +131,7 @@ func main() {
131
131
132
132
dev = devs [* networkDevice ]
133
133
} else {
134
- dev , err = selectDev (adj . Info . Addresses , config )
134
+ dev , err = selectDev ()
135
135
if err != nil {
136
136
trace .Fatal ().Err (err ).Msg ("Error selecting device" )
137
137
}
@@ -356,40 +356,26 @@ func createPid(path string) {
356
356
}
357
357
}
358
358
359
- func selectDev (adjAddr map [ string ] string , conf Config ) (pcap.Interface , error ) {
359
+ func selectDev () (pcap.Interface , error ) {
360
360
devs , err := pcap .FindAllDevs ()
361
361
if err != nil {
362
362
return pcap.Interface {}, err
363
363
}
364
364
365
- if conf .Network .Manual {
366
- cyan := color .New (color .FgCyan )
365
+ cyan := color .New (color .FgCyan )
367
366
368
- cyan .Print ("select a device: " )
369
- fmt .Printf ("(0-%d)\n " , len (devs )- 1 )
370
- for i , dev := range devs {
371
- displayDev (i , dev )
372
- }
373
-
374
- dev , err := acceptInput (len (devs ))
375
- if err != nil {
376
- return pcap.Interface {}, err
377
- }
378
-
379
- return devs [dev ], nil
380
- } else {
381
- for _ , dev := range devs {
382
- for _ , addr := range dev .Addresses {
383
- if addr .IP .String () == adjAddr ["backend" ] {
384
- println (dev .Name )
385
- return dev , nil
386
- }
387
- }
388
- }
367
+ cyan .Print ("select a device: " )
368
+ fmt .Printf ("(0-%d)\n " , len (devs )- 1 )
369
+ for i , dev := range devs {
370
+ displayDev (i , dev )
371
+ }
389
372
390
- log .Fatal ("backend address not found in any device" )
391
- return pcap.Interface {}, nil
373
+ dev , err := acceptInput (len (devs ))
374
+ if err != nil {
375
+ return pcap.Interface {}, err
392
376
}
377
+
378
+ return devs [dev ], nil
393
379
}
394
380
395
381
func displayDev (i int , dev pcap.Interface ) {
0 commit comments