j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Allow tincctl to connect to something besides localhost.

Browse source 
This would allow tincctl to connect to a remote tincd, or to a local tincd that
isn't listening on localhost, for example if it is using the BindToInterface or
BindToAddress options.
This commit is contained in:
Guus Sliepen 2011-05-29 14:41:05 +02:00
parent e6b21e1a51
commit 5bc957074a
1 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/tincctl.c
View file

@ -50,6 +50,7 @@ static char *controlcookiename = NULL; /* cookie file location */
static char controlcookie[1024]; static char controlcookie[1024];
char *netname = NULL; char *netname = NULL;
char *confbase = NULL; char *confbase = NULL;
static char *host = NULL;
#ifdef HAVE_MINGW #ifdef HAVE_MINGW
static struct WSAData wsa_state; static struct WSAData wsa_state;
@ -57,6 +58,7 @@ static struct WSAData wsa_state;
static struct option const long_options[] = { static struct option const long_options[] = {
{"config", required_argument, NULL, 'c'}, {"config", required_argument, NULL, 'c'},
{"host", required_argument, NULL, 'h'},
{"net", required_argument, NULL, 'n'}, {"net", required_argument, NULL, 'n'},
{"help", no_argument, NULL, 1}, {"help", no_argument, NULL, 1},
{"version", no_argument, NULL, 2}, {"version", no_argument, NULL, 2},
@ -108,7 +110,7 @@ static bool parse_options(int argc, char **argv) {
int r; int r;
int option_index = 0; int option_index = 0;
while((r = getopt_long(argc, argv, "c:n:", long_options, &option_index)) != EOF) { while((r = getopt_long(argc, argv, "c:n:h:", long_options, &option_index)) != EOF) {
switch (r) { switch (r) {
case 0: /* long option */ case 0: /* long option */
break; break;
@ -117,6 +119,10 @@ static bool parse_options(int argc, char **argv) {
confbase = xstrdup(optarg); confbase = xstrdup(optarg);
break; break;
case 'h': /* alternative host to connect to */
host = xstrdup(optarg);
break;
case 'n': /* net name given */ case 'n': /* net name given */
netname = xstrdup(optarg); netname = xstrdup(optarg);
break; break;
@ -430,7 +436,7 @@ void pcap(int fd, FILE *out) {
int main(int argc, char *argv[], char *envp[]) { int main(int argc, char *argv[], char *envp[]) {
int fd; int fd;
int result; int result;
int port; char port[128];
int pid; int pid;
program_name = argv[0]; program_name = argv[0];
@ -488,7 +494,7 @@ int main(int argc, char *argv[], char *envp[]) {
fprintf(stderr, "Could not open control socket cookie file %s: %s\n", controlcookiename, strerror(errno)); fprintf(stderr, "Could not open control socket cookie file %s: %s\n", controlcookiename, strerror(errno));
return 1; return 1;
} }
if(fscanf(f, "%1024s %d %d", controlcookie, &port, &pid) != 3) { if(fscanf(f, "%1024s %128s %d", controlcookie, port, &pid) != 3) {
fprintf(stderr, "Could not parse control socket cookie file %s\n", controlcookiename); fprintf(stderr, "Could not parse control socket cookie file %s\n", controlcookiename);
return 1; return 1;
} }
@ -500,13 +506,21 @@ int main(int argc, char *argv[], char *envp[]) {
} }
#endif #endif
struct sockaddr_in addr; struct addrinfo hints = {
memset(&addr, 0, sizeof addr); .ai_family = AF_UNSPEC,
addr.sin_family = AF_INET; .ai_socktype = SOCK_STREAM,
addr.sin_addr.s_addr = htonl(0x7f000001); .ai_protocol = IPPROTO_TCP,
addr.sin_port = htons(port); .ai_flags = 0,
};
fd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); struct addrinfo *res = NULL;
if(getaddrinfo(host, port, &hints, &res) || !res) {
fprintf(stderr, "Cannot resolve %s port %s: %s", host ?: "localhost", port, strerror(errno));
return 1;
}
fd = socket(res->ai_family, SOCK_STREAM, IPPROTO_TCP);
if(fd < 0) { if(fd < 0) {
fprintf(stderr, "Cannot create TCP socket: %s\n", sockstrerror(sockerrno)); fprintf(stderr, "Cannot create TCP socket: %s\n", sockstrerror(sockerrno));
return 1; return 1;
@ -520,12 +534,14 @@ int main(int argc, char *argv[], char *envp[]) {
} }
#endif #endif
if(connect(fd, (struct sockaddr *)&addr, sizeof addr) < 0) { if(connect(fd, res->ai_addr, res->ai_addrlen) < 0) {
fprintf(stderr, "Cannot connect to %s: %s\n", controlcookiename, sockstrerror(sockerrno)); fprintf(stderr, "Cannot connect to %s: %s\n", controlcookiename, sockstrerror(sockerrno));
return 1; return 1;
} }
freeaddrinfo(res);
char line[4096]; char line[4096];
char data[4096]; char data[4096];
int code, version, req; int code, version, req;