Archived
Allow multiple listenAddresses (fixes #52)
This commit is contained in:
Jakob Borg committed
1 parent
2297e29502
commit
3cb7b8f22b
4 files changed
+51
-19
No files matched your search
+1
-1
@@ -3,4 +3,4 @@ package auto
|
||||
|
||||
import "github.com/cratonica/embed"
|
||||
|
||||
var Resources embed.PackedResourceMap = embed.PackedResourceMap{0x1f, 0x8b, 0x8, 0x0, 0x0, 0x9, 0x6e, 0x88, 0x2, 0xff, 0xec, 0xbd, 0x6b, 0x8c, 0x24, 0x59, 0x97, 0x18, 0x54, 0xdf, 0x7a, 0x97, 0xb5, 0x73, 0x9f, 0xb0, 0xc0, 0xee, 0x22, 0xb, 0xb2, 0x62, 0xea, 0xcb, 0x89, 0xe8, 0x8c, 0xca, 0xaa, 0xea, 0x99, 0xef, 0x15, 0x51, 0xd1, 0xb9, 0xd5, 0xd5, 0xd5, 0xaf, 0xe9, 0xaa, 0xea, 0xa9, 0xaa, 0xee, 0xe9, 0x99, 0xac, 0x9c, 0xd9, 0x1b, 0x8f, 0x7c, 0x4c, 0x46, 0x46, 0x66, 0x47, 0x64, 0xd6, 0xa3, 0x2b, 0x13, 0xfe, 0x60, 0x81, 0x41, 0xb6, 0x10, 0x48, 0xb0, 0x5a, 0x59, 0x2, 0x56, 0x96, 0x8c, 0x84, 0x85, 0xb5, 0xd2, 0x8a, 0xa7, 0x8d, 0x25, 0x4, 0x8, 0xd6, 0x1f, 0x12, 0x12, 0xfe, 0x63, 0xcb, 0x18, 0xc, 0x58, 0x60, 0xb4, 0xc2, 0xc8, 0x5a, 0x4, 0xec, 0x9a, 0x15, 0xe7, 0x9c, 0xfb, 0x88, 0x1b, 0x99, 0x51, 0xd5, 0xdd, 0xf3, 0xcd, 0xb7, 0xeb, 0x85, 0xae, 0x99, 0xdb, 0x19, 0x71, 0xe3, 0xc6, 0xbd, 0x37, 0xce, 0x3d, 0xf7, 0xdc, 0xf3, 0xba, 0xe7, 0xfe, 0xcc, 0xca, 0xca, 0x4a, 0xa3, 0x9f, 0x84, 0xd1, 0x45, 0xa3, 0x37, 0x19, 0xc6, 0x8d, 0xec, 0x7c, 0xbc, 0xf2, 0xcb, 0x2b, 0x2b, 0xfe, 0xe6, 0xf3, 0x47, 0xfb, 0xd5, 0xef, 0x34, 0x3e, 0x84, 0xc7, 0x2b, 0x3f, 0xbb, 0xb2, 0xf2, 0x6f, 0xfc, 0xfa, 0xdf, 0x3b, 0x1a, 0xfd, 0xd2, 0x7b, 0x2b, 0x77, 0x3f, 0x5b, 0x59, 0xf9, 0xd2, 0x5f, 0x79, 0xa3, 0xbf, 0x2f, 0xfd, 0x51, 0xda, 0x5d, 0x1f, 0xfa, 0xe3, 0xd7, 0x94, 0xfb, 0xa7, 0xbf, 0xf4, 0x37, 0xb2, 0x34, 0xd8, 0xe8, 0xf6, 0x27, 0xbd, 0xa9, 0xdf, 0x8, 0x46, 0xc3, 0x8d, 0x80, 0xc5, 0xc3, 0xde, 0x46, 0x76, 0x99, 0x4, 0x93, 0x5e, 0x3f, 0xe9, 0x6e, 0x74, 0xa7, 0xfd, 0x8d, 0xbc, 0x93, 0x2b, 0xef, 0xfe, 0xde, 0xfd, 0xbd, 0xfb, 0xfb, 0x5a, 0xfe, 0xa6, 0x93, 0xce, 0xfa, 0x77, 0x7f, 0x6a, 0xe5, 0x83, 0xdb, 0x5b, 0x9b, 0x78, 0xfb, 0x9e, 0xb1, 0x5a, 0xfd, 0xb9, 0x7f, 0xe4, 0xd9, 0x3b, 0xb8, 0xbc, 0xfb, 0x7b, 0xf7, 0xf7, 0xee, 0xef, 0xdd, 0xdf, 0xbb, 0xbf, 0x77, 0x7f, 0xef, 0xfe, 0xde, 0xfd, 0xbd, 0xfb, 0x7b, 0xf7, 0xf7, 0xff, 0xa3, 0xbf, 0xc9, 0xf8, 0x47, 0x57, 0xfe, 0x19, 0xf8, 0xfd, 0x11, 0x71, 0xdf, 0x16, 0xbf, 0xdf, 0x58, 0xf8, 0xfd, 0x51, 0xf1, 0x7b, 0x4f, 0xfc, 0x7e, 0xbe, 0xf0, 0xfc, 0xc7, 0xc4, 0xef, 0xbe, 0xf8, 0xfd, 0xb5, 0x85, 0xe7, 0x7f, 0x44, 0xfc, 0xae, 0x89, 0xdf, 0xbf, 0xbb, 0xf0, 0xfc, 0xdd, 0xdf, 0xbb, 0xbf, 0x77, 0x7f, 0xef, 0xfe, 0xde, 0xfd, 0xbd, 0xfb, 0x7b, 0xf7, 0xf7, 0xee, 0xef, 0xdd, 0xdf, 0xbb, 0xbf, 0x77, 0x7f, 0xef, 0xfe, 0xde, 0xfd, 0xbd, 0xfb, 0x7b, 0xf7, 0xf7, 0xc3, 0xfb, 0x63, 0xe1, 0xca, 0xca, 0x1f, 0x87, 0xdf, 0x3f, 0x8f, 0x82, 0xf8, 0xcf, 0xe6, 0xf2, 0xff, 0xff, 0xfe, 0x33, 0x2b, 0x2b, 0xdf, 0x87, 0xf4, 0x9f, 0x41, 0xfa, 0x77, 0x20, 0x5d, 0x40, 0xda, 0x82, 0xf4, 0x93, 0x90, 0x7e, 0xeb, 0xa7, 0x57, 0x56, 0xfe, 0x2d, 0x48, 0x7f, 0xe, 0xd2, 0x9f, 0x86, 0x74, 0x8, 0xe9, 0x3b, 0x90, 0x6e, 0x41, 0xfa, 0x5, 0x48, 0xff, 0x38, 0xa4, 0x9f, 0x81, 0xf4, 0x7f, 0xfd, 0xd4, 0xca, 0xca, 0xff, 0x0, 0xe9, 0xbf, 0x86, 0xf4, 0xef, 0x42, 0xfa, 0x55, 0x48, 0xbf, 0x2, 0xe9, 0x4f, 0x43, 0x9a, 0x41, 0xea, 0x43, 0x7a, 0xc, 0xe9, 0x21, 0xa4, 0x7, 0x90, 0x3c, 0x48, 0x3f, 0xf, 0xe9, 0xff, 0xf9, 0xc9, 0x95, 0x95, 0xdf, 0x85, 0xf4, 0x3b, 0x90, 0xfe, 0x17, 0x48, 0xdf, 0x87, 0xf4, 0x9b, 0x90, 0xfe, 0x4b, 0x48, 0xff, 0x28, 0xa4, 0xdf, 0xfb, 0x89, 0x95, 0x95, 0xbf, 0xf, 0xe9, 0x77, 0x21, 0xfd, 0x3d, 0x48, 0xff, 0x2b, 0xa4, 0xbf, 0x3, 0xe9, 0x3f, 0x85, 0xf4, 0x1b, 0x90, 0x7e, 0x5, 0xd2, 0x15, 0xa4, 0x47, 0x90, 0x1c, 0x48, 0xdf, 0x83, 0xf4, 0x4f, 0x61, 0xf9, 0xa, 0xe4, 0x43, 0xfa, 0x45, 0x48, 0xbf, 0xf5, 0xc7, 0x56, 0x56, 0xfe, 0x12, 0x24, 0x17, 0xd2, 0x6f, 0xfc, 0x51, 0x68, 0x1f, 0xd2, 0xdf, 0xf8, 0xf1, 0x95, 0x95, 0xff, 0x0, 0xd2, 0xaf, 0x42, 0xfa, 0x59, 0x48, 0xff, 0xc7, 0x3f, 0xb4, 0xb2, 0xf2, 0x37, 0x21, 0xfd, 0x15, 0x48, 0x7f, 0x11, 0xd2, 0x7f, 0x4, 0xe9, 0xdf, 0x84, 0x34, 0x87, 0x74, 0x0, 0xe9, 0xb7, 0x7f, 0x6c, 0x65, 0xe5, 0x3f, 0x84, 0xf4, 0xab, 0x90, 0x52, 0x48, 0x77, 0x21, 0xfd, 0xc, 0xa4, 0xef, 0xff, 0xe8, 0xca, 0xca, 0x4b, 0x48, 0x8f, 0x20, 0xbd, 0xf, 0xe9, 0xb7, 0xff, 0xc8, 0xca, 0xca, 0xbf, 0xe, 0x69, 0xe, 0xc9, 0x81, 0xf4, 0x23, 0x90, 0xfe, 0xe2, 0x8f, 0xac, 0xac, 0x4c, 0x20, 0x39, 0x90, 0xfe, 0xea, 0x37, 0x38, 0xfc, 0xff, 0xed, 0xd7, 0x28, 0x43, 0xaa, 0xaf, 0xf9, 0xdb, 0xde, 0xc8, 0xc6, 0x2c, 0xb9, 0xf3, 0xda, 0x72, 0x54, 0x16, 0x8b, 0x56, 0x83, 0x98, 0x65, 0x99, 0x67, 0x4c, 0xa2, 0x8b, 0xc9, 0xfa, 0x70, 0x3a, 0x89, 0xc2, 0x6a, 0x37, 0xbe, 0x1c, 0xf7, 0xfa, 0xc1, 0x28, 0xc9, 0xaf, 0xd6, 0x83, 0x5e, 0x74, 0x96, 0xc2, 0x6f, 0x38, 0x3a, 0x4f, 0x8c, 0x3b, 0x6f, 0xd3, 0xca, 0xd5, 0x55, 0x3f, 0xf1, 0xc7, 0x59, 0x75, 0x56, 0x1d, 0x46, 0x93, 0xb4, 0x1f, 0xcc, 0xe7, 0x70, 0xb7, 0xf2, 0x66, 0x7d, 0x4b, 0xba, 0xeb, 0x59, 0x6f, 0x74, 0xee, 0x19, 0xc9, 0x28, 0x8c, 0x76, 0x3b, 0xdd, 0xc6, 0x1, 0xfc, 0x3e, 0xba, 0x57, 0x5d, 0xf5, 0xaa, 0xc3, 0xcb, 0x47, 0xf7, 0x8c, 0x9b, 0x7b, 0xb0, 0x3d, 0x9, 0xab, 0xd9, 0xe4, 0x32, 0x8e, 0x3c, 0xe3, 0xbc, 0x1f, 0x4e, 0x7a, 0xce, 0xd6, 0xe6, 0x37, 0x8d, 0xc2, 0xf7, 0xa6, 0xfd, 0x6e, 0x6f, 0xf2, 0xb6, 0xb5, 0xdc, 0xfe, 0xd6, 0x37, 0x11, 0x2, 0x93, 0xf0, 0x6d, 0xdf, 0x83, 0xd6, 0xef, 0x5c, 0x5d, 0x9d, 0x45, 0x69, 0xd6, 0x1f, 0xLine truncated
|
||||
var Resources embed.PackedResourceMap = embed.PackedResourceMap{0x1f, 0x8b, 0x8, 0x0, 0x0, 0x9, 0x6e, 0x88, 0x2, 0xff, 0xec, 0xbd, 0x7b, 0x90, 0x24, 0xcb, 0x7a, 0x1f, 0x34, 0xd2, 0xd5, 0xd5, 0xa3, 0x25, 0x59, 0xc2, 0x57, 0xc6, 0xe, 0xc2, 0x32, 0x3d, 0x75, 0xc7, 0xb3, 0x55, 0xa7, 0x6b, 0x7a, 0x66, 0xf6, 0x1c, 0x9d, 0x7b, 0x6f, 0xd5, 0xd4, 0x69, 0xcd, 0xce, 0xce, 0xbe, 0x67, 0x77, 0xcf, 0xcc, 0xec, 0x9e, 0x47, 0x4f, 0x9f, 0xa3, 0x7a, 0xf5, 0xe3, 0x4c, 0x77, 0x75, 0x6f, 0x57, 0xf7, 0xcc, 0xce, 0xce, 0x34, 0x96, 0xfd, 0x87, 0x64, 0xc9, 0xe2, 0x21, 0x24, 0xf3, 0x30, 0x36, 0xc6, 0x60, 0x1, 0xc2, 0x81, 0xb1, 0x71, 0x38, 0x10, 0x98, 0xb0, 0x3, 0x81, 0xcd, 0x1f, 0xd8, 0xc6, 0x32, 0x36, 0x1, 0xc6, 0x8f, 0x8, 0x19, 0x83, 0x84, 0x23, 0x4c, 0x40, 0xf8, 0x1, 0x6, 0x5b, 0xfc, 0xbe, 0x2f, 0x33, 0xab, 0xb2, 0xaa, 0x7b, 0xf6, 0x71, 0x74, 0x25, 0xc, 0x9e, 0x39, 0x27, 0xb7, 0xab, 0xb2, 0xb2, 0x32, 0xb3, 0x32, 0xbf, 0xfc, 0xf2, 0x7b, 0xe7, 0xb7, 0x2f, 0x2d, 0x2d, 0xd5, 0xfd, 0xd1, 0xa8, 0xfe, 0x59, 0x5a, 0x4f, 0x4f, 0x47, 0x4b, 0xa3, 0xa5, 0xa5, 0x60, 0xe3, 0xe9, 0xdd, 0xbd, 0xea, 0x57, 0xea, 0xef, 0xe0, 0xd1, 0xd2, 0x77, 0x2f, 0x2d, 0x19, 0x3f, 0xf3, 0xbf, 0xef, 0xff, 0xad, 0x3b, 0x5f, 0x5e, 0xba, 0xf3, 0x3, 0x4b, 0x4b, 0x9f, 0x5, 0x4b, 0xaf, 0xf5, 0xf7, 0x59, 0x30, 0x1c, 0x77, 0xd6, 0x6, 0xc1, 0xe8, 0x15, 0xe5, 0xfe, 0x99, 0xcf, 0x82, 0xf5, 0x74, 0x1c, 0xae, 0x77, 0x7a, 0x93, 0xee, 0x34, 0xa8, 0x87, 0xc3, 0xc1, 0x7a, 0xe8, 0xf7, 0x7, 0xdd, 0xf5, 0xf4, 0x2c, 0x9, 0x27, 0xdd, 0x5e, 0xd2, 0x59, 0xef, 0x4c, 0x7b, 0xeb, 0xa2, 0x83, 0x4b, 0x57, 0x7f, 0x57, 0x7f, 0x57, 0x7f, 0x5f, 0xb7, 0xbf, 0xe9, 0xa4, 0xbd, 0xf6, 0xd5, 0xef, 0x5c, 0x7a, 0xfb, 0xfa, 0xe6, 0x6, 0xdd, 0x7e, 0xd9, 0x58, 0xae, 0x7e, 0xe9, 0xd7, 0x3e, 0xb9, 0x1a, 0x97, 0xab, 0xbf, 0xab, 0xbf, 0xab, 0xbf, 0xab, 0xbf, 0xab, 0xbf, 0xab, 0xbf, 0xab, 0xbf, 0xab, 0xbf, 0xab, 0xbf, 0xab, 0xbf, 0x7f, 0x8c, 0xfe, 0x26, 0xa3, 0x2f, 0x2e, 0xfd, 0x16, 0xfc, 0x7e, 0xa3, 0xbc, 0x7f, 0x47, 0xfe, 0x7e, 0x43, 0xe9, 0xf7, 0x8b, 0xf2, 0xd7, 0x92, 0xbf, 0xef, 0x96, 0x9e, 0x7f, 0x93, 0xfc, 0x7d, 0x5f, 0xfe, 0x7e, 0x5a, 0x7a, 0xfe, 0xcd, 0xf2, 0xb7, 0x26, 0x7f, 0xff, 0x83, 0xd2, 0xf3, 0x2f, 0x28, 0x59, 0x82, 0xfc, 0xfd, 0x4b, 0xa5, 0xe7, 0x57, 0x7f, 0x57, 0x7f, 0x57, 0x7f, 0x57, 0x7f, 0x57, 0x7f, 0x57, 0x7f, 0x57, 0x7f, 0x57, 0x7f, 0x57, 0x7f, 0x57, 0x7f, 0x57, 0x7f, 0x57, 0x7f, 0x57, 0x7f, 0x57, 0x7f, 0x57, 0x7f, 0x9f, 0xff, 0xcf, 0x8f, 0x96, 0x96, 0x7e, 0x12, 0xcc, 0xf9, 0xf, 0x7e, 0xcb, 0x12, 0xeb, 0xff, 0x15, 0xff, 0xff, 0x5f, 0x7f, 0xd7, 0xd2, 0xd2, 0x9f, 0x45, 0xfa, 0x67, 0x91, 0x4e, 0x91, 0x8e, 0x90, 0x9a, 0x48, 0xef, 0x21, 0xad, 0x22, 0x7d, 0x37, 0xd2, 0xff, 0xf9, 0x6b, 0x96, 0x96, 0xfe, 0xf, 0xa4, 0x3f, 0x87, 0xf4, 0x33, 0x48, 0x4f, 0x91, 0xfe, 0xe1, 0x77, 0x2e, 0x2d, 0xfd, 0x1e, 0xa4, 0x6, 0xd2, 0xff, 0xf0, 0x1d, 0x78, 0x17, 0xe9, 0x4b, 0x48, 0xbf, 0x16, 0xe9, 0xbf, 0xfc, 0xf6, 0xa5, 0xa5, 0x13, 0xa4, 0x7f, 0x1a, 0xe9, 0x4f, 0x55, 0x96, 0x96, 0x86, 0x48, 0x5d, 0xa4, 0xe, 0xd2, 0x4d, 0x24, 0xb, 0xe9, 0xff, 0xfa, 0xb6, 0xa5, 0xa5, 0xbf, 0x8c, 0xf4, 0xe7, 0x91, 0xfe, 0x34, 0xd2, 0x7f, 0x85, 0xf4, 0x7, 0x90, 0x7e, 0x1c, 0xe9, 0x26, 0xd2, 0xa, 0xd2, 0x3f, 0x85, 0xf4, 0x3d, 0x48, 0x5f, 0x42, 0xfa, 0x4b, 0xdf, 0xba, 0xb4, 0xf4, 0xc7, 0x90, 0xfe, 0x8, 0xd2, 0x39, 0x52, 0xb, 0x69, 0xb, 0xc9, 0x45, 0xfa, 0x25, 0x7c, 0xd3, 0x5f, 0xf9, 0x16, 0xf1, 0x6d, 0xd7, 0x91, 0xee, 0x23, 0xfd, 0x3d, 0x7c, 0xeb, 0x9f, 0x45, 0xfa, 0x29, 0xa4, 0x1f, 0x42, 0xfa, 0x18, 0xe9, 0x3e, 0x92, 0x85, 0xf4, 0xbd, 0x48, 0xbf, 0xe, 0xe9, 0x7b, 0x90, 0xfe, 0xb7, 0x2f, 0x2e, 0x2d, 0xfd, 0x51, 0xa4, 0x9f, 0x40, 0xfa, 0x61, 0xa4, 0x7, 0x48, 0x35, 0xa4, 0xa, 0xd2, 0xdf, 0xfc, 0xa6, 0xa5, 0xa5, 0x3f, 0x83, 0xf4, 0x9f, 0x21, 0xfd, 0x20, 0xd2, 0x27, 0x48, 0x1b, 0x48, 0xdf, 0x83, 0xf4, 0x25, 0xa4, 0xbf, 0xfb, 0x85, 0xa5, 0xa5, 0xff, 0xe, 0xe9, 0x8f, 0x22, 0xfd, 0x5e, 0xa4, 0xdf, 0x8c, 0xf4, 0xef, 0x7e, 0xe3, 0xd2, 0xd2, 0x8f, 0x22, 0x5, 0x48, 0x5f, 0x43, 0xba, 0x86, 0xf4, 0x77, 0xbf, 0x61, 0x69, 0xe9, 0x4f, 0x22, 0xfd, 0x47, 0x48, 0xff, 0x2, 0xd2, 0xbf, 0x82, 0x54, 0xd5, 0xfe, 0x56, 0xd2, 0x70, 0x38, 0x8a, 0xeb, 0xe1, 0x30, 0x49, 0xe2, 0x70, 0xd2, 0x1b, 0x26, 0x69, 0xd5, 0xab, 0x46, 0xfe, 0xc4, 0x77, 0xb, 0xc5, 0x66, 0x85, 0x3b, 0xed, 0xc5, 0xe1, 0x74, 0x12, 0x8c, 0xd2, 0x6a, 0x4d, 0xbc, 0xd4, 0xec, 0x45, 0xad, 0x7a, 0x2f, 0x41, 0x8e, 0x7b, 0xd9, 0xb, 0xfc, 0xb4, 0x50, 0x5e, 0x54, 0x31, 0xff, 0xc2, 0x7c, 0x9b, 0xf4, 0x57, 0x7a, 0xd, 0xbd, 0xdd, 0x70, 0x5f, 0x5e, 0x50, 0xb4, 0xb8, 0xb0, 0xdc, 0xac, 0x1a, 0xfa, 0x93, 0xb0, 0x5b, 0x35, 0x63, 0xab, 0x7a, 0xfe, 0x9a, 0xcd, 0xed, 0xf9, 0x93, 0x6e, 0x7d, 0xe0, 0x3f, 0x37, 0x37, 0xec, 0xea, 0x57, 0xab, 0x6f, 0x55, 0xcd, 0xac, 0xc8, 0xa3, 0xe9, 0xe4, 0xc6, 0xd9, 0x24, 0x4e, 0xf, 0x87, 0x13, 0xbf, 0x5f, 0x5d, 0x5b, 0x30, 0xb6, 0xf3, 0xc5, 0xac, 0xea, 0x7a, 0x75, 0x12, 0x59, 0xaf, 0xf9, 0x9, 0x97, 0xb7, 0x7d, 0x37, 0x79, 0x9d, 0xa6, 0xf5, 0x52, 0x97, 0xb6, 0x3c, 0x19, 0x9f, 0x95, 0x6, 0xa3, 0x3d, 0x1c, 0x57, 0xcd, 0x13, 0x7f, 0x5c, 0xed, 0x45, 0xd5, 0x5e, 0xc2, 0xdd, 0x2a, 0x8f, 0x57, 0xLine truncated
|
||||
@@ -27,20 +27,20 @@ type NodeConfiguration struct {
|
||||
}
|
||||
|
||||
type OptionsConfiguration struct {
|
||||
ListenAddress string `xml:"listenAddress" default:":22000" ini:"listen-address"`
|
||||
ReadOnly bool `xml:"readOnly" ini:"read-only"`
|
||||
AllowDelete bool `xml:"allowDelete" default:"true" ini:"allow-delete"`
|
||||
FollowSymlinks bool `xml:"followSymlinks" default:"true" ini:"follow-symlinks"`
|
||||
GUIEnabled bool `xml:"guiEnabled" default:"true" ini:"gui-enabled"`
|
||||
GUIAddress string `xml:"guiAddress" default:"127.0.0.1:8080" ini:"gui-address"`
|
||||
GlobalAnnServer string `xml:"globalAnnounceServer" default:"syncthing.nym.se:22025" ini:"global-announce-server"`
|
||||
GlobalAnnEnabled bool `xml:"globalAnnounceEnabled" default:"true" ini:"global-announce-enabled"`
|
||||
LocalAnnEnabled bool `xml:"localAnnounceEnabled" default:"true" ini:"local-announce-enabled"`
|
||||
ParallelRequests int `xml:"parallelRequests" default:"16" ini:"parallel-requests"`
|
||||
MaxSendKbps int `xml:"maxSendKbps" ini:"max-send-kbps"`
|
||||
RescanIntervalS int `xml:"rescanIntervalS" default:"60" ini:"rescan-interval"`
|
||||
ReconnectIntervalS int `xml:"reconnectionIntervalS" default:"60" ini:"reconnection-interval"`
|
||||
MaxChangeKbps int `xml:"maxChangeKbps" default:"1000" ini:"max-change-bw"`
|
||||
ListenAddress []string `xml:"listenAddress" default:":22000" ini:"listen-address"`
|
||||
ReadOnly bool `xml:"readOnly" ini:"read-only"`
|
||||
AllowDelete bool `xml:"allowDelete" default:"true" ini:"allow-delete"`
|
||||
FollowSymlinks bool `xml:"followSymlinks" default:"true" ini:"follow-symlinks"`
|
||||
GUIEnabled bool `xml:"guiEnabled" default:"true" ini:"gui-enabled"`
|
||||
GUIAddress string `xml:"guiAddress" default:"127.0.0.1:8080" ini:"gui-address"`
|
||||
GlobalAnnServer string `xml:"globalAnnounceServer" default:"syncthing.nym.se:22025" ini:"global-announce-server"`
|
||||
GlobalAnnEnabled bool `xml:"globalAnnounceEnabled" default:"true" ini:"global-announce-enabled"`
|
||||
LocalAnnEnabled bool `xml:"localAnnounceEnabled" default:"true" ini:"local-announce-enabled"`
|
||||
ParallelRequests int `xml:"parallelRequests" default:"16" ini:"parallel-requests"`
|
||||
MaxSendKbps int `xml:"maxSendKbps" ini:"max-send-kbps"`
|
||||
RescanIntervalS int `xml:"rescanIntervalS" default:"60" ini:"rescan-interval"`
|
||||
ReconnectIntervalS int `xml:"reconnectionIntervalS" default:"60" ini:"reconnection-interval"`
|
||||
MaxChangeKbps int `xml:"maxChangeKbps" default:"1000" ini:"max-change-bw"`
|
||||
}
|
||||
|
||||
func setDefaults(data interface{}) error {
|
||||
@@ -57,6 +57,11 @@ func setDefaults(data interface{}) error {
|
||||
case string:
|
||||
f.SetString(v)
|
||||
|
||||
case []string:
|
||||
rv := reflect.MakeSlice(reflect.TypeOf([]string{}), 1, 1)
|
||||
rv.Index(0).SetString(v)
|
||||
f.Set(rv)
|
||||
|
||||
case int:
|
||||
i, err := strconv.ParseInt(v, 10, 64)
|
||||
if err != nil {
|
||||
@@ -121,6 +126,20 @@ func writeConfigXML(wr io.Writer, cfg Configuration) error {
|
||||
return err
|
||||
}
|
||||
|
||||
func uniqueStrings(ss []string) []string {
|
||||
var m = make(map[string]bool, len(ss))
|
||||
for _, s := range ss {
|
||||
m[s] = true
|
||||
}
|
||||
|
||||
var us = make([]string, 0, len(m))
|
||||
for k := range m {
|
||||
us = append(us, k)
|
||||
}
|
||||
|
||||
return us
|
||||
}
|
||||
|
||||
func readConfigXML(rd io.Reader) (Configuration, error) {
|
||||
var cfg Configuration
|
||||
|
||||
@@ -132,5 +151,6 @@ func readConfigXML(rd io.Reader) (Configuration, error) {
|
||||
err = xml.NewDecoder(rd).Decode(&cfg)
|
||||
}
|
||||
|
||||
cfg.Options.ListenAddress = uniqueStrings(cfg.Options.ListenAddress)
|
||||
return cfg, err
|
||||
}
|
||||
+3
-1
@@ -11,7 +11,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
|
||||
|
||||
// Strings before bools look better
|
||||
$scope.settings = [
|
||||
{id: 'ListenAddress', descr:"Sync Protocol Listen Address", type: 'string', restart: true},
|
||||
{id: 'ListenStr', descr:"Sync Protocol Listen Addresses", type: 'string', restart: true},
|
||||
{id: 'GUIAddress', descr: "GUI Listen Address", type: 'string', restart: true},
|
||||
{id: 'MaxSendKbps', descr: "Outgoing Rate Limit (KBps)", type: 'string', restart: true},
|
||||
{id: 'RescanIntervalS', descr: "Rescan Interval (s)", type: 'string', restart: true},
|
||||
@@ -49,6 +49,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
|
||||
|
||||
$http.get("/rest/config").success(function (data) {
|
||||
$scope.config = data;
|
||||
$scope.config.Options.ListenStr = $scope.config.Options.ListenAddress.join(", ")
|
||||
|
||||
var nodes = $scope.config.Repositories[0].Nodes;
|
||||
nodes = nodes.filter(function (x) { return x.NodeID != $scope.myID; });
|
||||
@@ -170,6 +171,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
|
||||
};
|
||||
|
||||
$scope.saveSettings = function () {
|
||||
$scope.config.Options.ListenAddress = $scope.config.Options.ListenStr.split(',').map(function (x) { return x.trim(); });
|
||||
$http.post('/rest/config', JSON.stringify($scope.config), {headers: {'Content-Type': 'application/json'}});
|
||||
$('#settingsTable').collapse('hide');
|
||||
};
|
||||
|
||||
@@ -208,13 +208,16 @@ func main() {
|
||||
if verbose {
|
||||
infoln("Listening for incoming connections")
|
||||
}
|
||||
go listen(myID, cfg.Options.ListenAddress, m, tlsCfg)
|
||||
for _, addr := range cfg.Options.ListenAddress {
|
||||
go listen(myID, addr, m, tlsCfg)
|
||||
}
|
||||
|
||||
// Routine to connect out to configured nodes
|
||||
if verbose {
|
||||
infoln("Attempting to connect to other nodes")
|
||||
}
|
||||
go connect(myID, cfg.Options.ListenAddress, m, tlsCfg)
|
||||
disc := discovery(cfg.Options.ListenAddress[0])
|
||||
go connect(myID, disc, m, tlsCfg)
|
||||
|
||||
// Routine to pull blocks from other nodes to synchronize the local
|
||||
// repository. Does not run when we are in read only (publish only) mode.
|
||||
@@ -318,6 +321,9 @@ func printStatsLoop(m *model.Model) {
|
||||
}
|
||||
|
||||
func listen(myID string, addr string, m *model.Model, tlsCfg *tls.Config) {
|
||||
if strings.Contains(trace, "connect") {
|
||||
debugln("NET: Listening on", addr)
|
||||
}
|
||||
l, err := tls.Listen("tcp", addr, tlsCfg)
|
||||
fatalErr(err)
|
||||
|
||||
@@ -369,7 +375,7 @@ listen:
|
||||
}
|
||||
}
|
||||
|
||||
func connect(myID string, addr string, m *model.Model, tlsCfg *tls.Config) {
|
||||
func discovery(addr string) *discover.Discoverer {
|
||||
_, portstr, err := net.SplitHostPort(addr)
|
||||
fatalErr(err)
|
||||
port, _ := strconv.Atoi(portstr)
|
||||
@@ -392,6 +398,10 @@ func connect(myID string, addr string, m *model.Model, tlsCfg *tls.Config) {
|
||||
warnf("No discovery possible (%v)", err)
|
||||
}
|
||||
|
||||
return disc
|
||||
}
|
||||
|
||||
func connect(myID string, disc *discover.Discoverer, m *model.Model, tlsCfg *tls.Config) {
|
||||
connOpts := map[string]string{
|
||||
"clientId": "syncthing",
|
||||
"clientVersion": Version,
|
||||
|
||||
Reference in new issue
Block a user