projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix support for tunemu on iOS devices.
[tinc]
/
src
/
control.c
diff --git
a/src/control.c
b/src/control.c
index
956d6ee
..
83a9d79
100644
(file)
--- a/
src/control.c
+++ b/
src/control.c
@@
-29,7
+29,6
@@
#include "netutl.h"
#include "protocol.h"
#include "route.h"
#include "netutl.h"
#include "protocol.h"
#include "route.h"
-#include "splay_tree.h"
#include "utils.h"
#include "xalloc.h"
#include "utils.h"
#include "xalloc.h"
@@
-59,12
+58,12
@@
bool control_h(connection_t *c, const char *request) {
switch (type) {
case REQ_STOP:
switch (type) {
case REQ_STOP:
- event_
loopexit(NULL
);
+ event_
exit(
);
return control_ok(c, REQ_STOP);
case REQ_DUMP_NODES:
return dump_nodes(c);
return control_ok(c, REQ_STOP);
case REQ_DUMP_NODES:
return dump_nodes(c);
-
+
case REQ_DUMP_EDGES:
return dump_edges(c);
case REQ_DUMP_EDGES:
return dump_edges(c);
@@
-99,16
+98,12
@@
bool control_h(connection_t *c, const char *request) {
case REQ_DISCONNECT: {
char name[MAX_STRING_SIZE];
case REQ_DISCONNECT: {
char name[MAX_STRING_SIZE];
- connection_t *other;
- splay_node_t *node, *next;
bool found = false;
if(sscanf(request, "%*d %*d " MAX_STRING, name) != 1)
return control_return(c, REQ_DISCONNECT, -1);
bool found = false;
if(sscanf(request, "%*d %*d " MAX_STRING, name) != 1)
return control_return(c, REQ_DISCONNECT, -1);
- for(node = connection_tree->head; node; node = next) {
- next = node->next;
- other = node->data;
+ for list_each(connection_t, other, connection_list) {
if(strcmp(other->name, name))
continue;
terminate_connection(other, other->status.active);
if(strcmp(other->name, name))
continue;
terminate_connection(other, other->status.active);
@@
-161,7
+156,7
@@
bool init_control(void) {
// Make sure we have a valid address, and map 0.0.0.0 and :: to 127.0.0.1 and ::1.
// Make sure we have a valid address, and map 0.0.0.0 and :: to 127.0.0.1 and ::1.
- if(getsockname(listen_socket[0].tcp, (struct sockaddr *)&sa, &len)) {
+ if(getsockname(listen_socket[0].tcp
.fd
, (struct sockaddr *)&sa, &len)) {
xasprintf(&localhost, "127.0.0.1 port %d", myport);
} else {
if(sa.sa.sa_family == AF_INET) {
xasprintf(&localhost, "127.0.0.1 port %d", myport);
} else {
if(sa.sa.sa_family == AF_INET) {