@@ -19,7 +19,7 @@ func printUsage() {
19
19
fmt .Println ("Example SCION address: 17-ffaa:1:bfd,[127.0.0.1]:42002" )
20
20
fmt .Println ("Available flags:" )
21
21
fmt .Println (" -h: Show help" )
22
- fmt .Println (" -P : Use IA when resolving SCIOND socket path" )
22
+ fmt .Println (" -local : Use IA when resolving SCIOND socket path" )
23
23
fmt .Println (" -b: Send an extra byte before sending the actual data" )
24
24
}
25
25
@@ -32,42 +32,40 @@ func main() {
32
32
port uint16
33
33
useIASCIONDPath bool
34
34
extraByte bool
35
- )
36
- flag . BoolVar ( & showHelp , "h" , false , "Show help" )
37
- flag .BoolVar (& USE_IA_SCIOND_PATH , "P " , false , "Use IA SCIOND Path" )
38
- flag .BoolVar (& SEND_PIPER_BYTE , "b" , false , "Send extra byte" )
35
+ )
36
+ flag . Usage = printUsage
37
+ flag .BoolVar (& useIASCIONDPath , "local " , false , "Use IA SCIOND Path" )
38
+ flag .BoolVar (& useIASCIONDPath , "b" , false , "Send extra byte" )
39
39
flag .Parse ()
40
- if showHelp {
41
- printUsage ()
42
- return
43
- }
44
40
45
41
tail := flag .Args ()
46
42
if len (tail ) != 2 {
43
+ printUsage ()
47
44
golog .Panicf ("Number of arguments is not two! Arguments: %v" , tail )
48
45
}
49
46
50
- SERVER_ADDRESS = tail [0 ]
47
+ serverAddress = tail [0 ]
51
48
port64 , err := strconv .ParseUint (tail [1 ], 10 , 16 )
52
49
if err != nil {
50
+ printUsage ()
53
51
golog .Panicf ("Can't parse port string %v: %v" , port64 , err )
54
52
}
55
- PORT = uint16 (port64 )
53
+ port = uint16 (port64 )
56
54
57
55
// Initialize SCION library
58
- err = utils .InitSCION ("" , "" , USE_IA_SCIOND_PATH )
56
+ err = utils .InitSCION ("" , "" , useIASCIONDPath )
59
57
if err != nil {
60
58
golog .Panicf ("Error initializing SCION connection: %v" , err )
61
59
}
62
60
63
- conn , err := utils .DialSCION (fmt .Sprintf ("%s:%v" , SERVER_ADDRESS , PORT ))
61
+ conn , err := utils .DialSCION (fmt .Sprintf ("%s:%v" , serverAddress , port ))
64
62
if err != nil {
65
63
golog .Panicf ("Error dialing remote: %v" , err )
66
64
}
67
65
68
66
log .Debug ("Connected!" )
69
67
70
- if SEND_PIPER_BYTE {
68
+ if extraByte {
71
69
_ , err := conn .Write ([]byte {71 })
72
70
if err != nil {
73
71
golog .Panicf ("Error writing extra byte: %v" , err )
0 commit comments