diff options
Diffstat (limited to 'src/charon/control/interfaces/dbus_interface.c')
| -rw-r--r-- | src/charon/control/interfaces/dbus_interface.c | 146 |
1 files changed, 120 insertions, 26 deletions
diff --git a/src/charon/control/interfaces/dbus_interface.c b/src/charon/control/interfaces/dbus_interface.c index 178f74ff5..5805d2b46 100644 --- a/src/charon/control/interfaces/dbus_interface.c +++ b/src/charon/control/interfaces/dbus_interface.c @@ -89,6 +89,79 @@ static void set_state(private_dbus_interface_t *this, NMVPNState state) this->state = state; } + +/** + * get the child_cfg with the same name as the peer cfg + */ +static child_cfg_t* get_child_from_peer(peer_cfg_t *peer_cfg, char *name) +{ + child_cfg_t *current, *found = NULL; + iterator_t *iterator; + + iterator = peer_cfg->create_child_cfg_iterator(peer_cfg); + while (iterator->iterate(iterator, (void**)¤t)) + { + if (streq(current->get_name(current), name)) + { + found = current; + found->get_ref(found); + break; + } + } + iterator->destroy(iterator); + return found; +} + +/** + * get a peer configuration by its name, or a name of its children + */ +static peer_cfg_t *get_peer_cfg_by_name(char *name) +{ + iterator_t *i1, *i2; + peer_cfg_t *current, *found = NULL; + child_cfg_t *child; + + i1 = charon->backends->create_iterator(charon->backends); + while (i1->iterate(i1, (void**)¤t)) + { + /* compare peer_cfgs name first */ + if (streq(current->get_name(current), name)) + { + found = current; + found->get_ref(found); + break; + } + /* compare all child_cfg names otherwise */ + i2 = current->create_child_cfg_iterator(current); + while (i2->iterate(i2, (void**)&child)) + { + if (streq(child->get_name(child), name)) + { + found = current; + found->get_ref(found); + break; + } + } + i2->destroy(i2); + if (found) + { + break; + } + } + i1->destroy(i1); + return found; +} + +/** + * logging dummy + */ +static bool dbus_log(void *param, signal_t signal, level_t level, + ike_sa_t *ike_sa, char *format, va_list args) +{ + return TRUE; +} + + /** * process NetworkManagers startConnection method call */ @@ -101,6 +174,9 @@ static bool start_connection(private_dbus_interface_t *this, DBusMessage* msg) char *dev, *domain, *banner; const dbus_int32_t array[] = {}; const dbus_int32_t *varray = array; + peer_cfg_t *peer_cfg; + child_cfg_t *child_cfg; + status_t status = FAILED; if (!dbus_message_get_args(msg, &this->err, DBUS_TYPE_STRING, &name, DBUS_TYPE_STRING, &user, @@ -113,33 +189,48 @@ static bool start_connection(private_dbus_interface_t *this, DBusMessage* msg) } set_state(this, NM_VPN_STATE_STARTING); - reply = dbus_message_new_method_return(msg); - dbus_connection_send(this->conn, reply, NULL); - - signal = dbus_message_new_signal(NM_DBUS_PATH_STRONG, - NM_DBUS_INTERFACE_STRONG, - NM_DBUS_VPN_SIGNAL_IP4_CONFIG); - - me = other = p2p = mss = netmask = 0; - dev = domain = banner = ""; - if (dbus_message_append_args(signal, - DBUS_TYPE_UINT32, &other, - DBUS_TYPE_STRING, &dev, - DBUS_TYPE_UINT32, &me, - DBUS_TYPE_UINT32, &p2p, - DBUS_TYPE_UINT32, &netmask, - DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &varray, 0, - DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &varray, 0, - DBUS_TYPE_UINT32, &mss, - DBUS_TYPE_STRING, &domain, - DBUS_TYPE_STRING, &banner)) + peer_cfg = get_peer_cfg_by_name(name); + if (peer_cfg) { - dbus_connection_send(this->conn, signal, NULL); - } - dbus_message_unref(signal); + child_cfg = get_child_from_peer(peer_cfg, name); + if (child_cfg) + { + status = charon->interfaces->initiate(charon->interfaces, peer_cfg, + child_cfg, dbus_log, NULL); + } + } - set_state(this, NM_VPN_STATE_STARTED); + if (status == SUCCESS) + { + signal = dbus_message_new_signal(NM_DBUS_PATH_STRONG, + NM_DBUS_INTERFACE_STRONG, + NM_DBUS_VPN_SIGNAL_IP4_CONFIG); + me = other = p2p = mss = netmask = 0; + dev = domain = banner = ""; + if (dbus_message_append_args(signal, + DBUS_TYPE_UINT32, &other, + DBUS_TYPE_STRING, &dev, + DBUS_TYPE_UINT32, &me, + DBUS_TYPE_UINT32, &p2p, + DBUS_TYPE_UINT32, &netmask, + DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &varray, 0, + DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &varray, 0, + DBUS_TYPE_UINT32, &mss, + DBUS_TYPE_STRING, &domain, + DBUS_TYPE_STRING, &banner, DBUS_TYPE_INVALID)) + { + dbus_connection_send(this->conn, signal, NULL); + } + dbus_message_unref(signal); + set_state(this, NM_VPN_STATE_STARTED); + } + else + { + set_state(this, NM_VPN_STATE_STOPPED); + } + reply = dbus_message_new_method_return(msg); + dbus_connection_send(this->conn, reply, NULL); dbus_connection_flush(this->conn); dbus_message_unref(reply); return TRUE; @@ -247,6 +338,9 @@ static DBusHandlerResult signal_handler(DBusConnection *con, DBusMessage *msg, */ static void dispatch(private_dbus_interface_t *this) { + /* drop threads capabilities */ + charon->drop_capabilities(charon, FALSE, FALSE); + while (dbus_connection_read_write_dispatch(this->conn, -1)) { /* nothing */ @@ -273,7 +367,7 @@ interface_t *interface_create() DBusObjectPathVTable v = {NULL, (void*)&message_handler, NULL, NULL, NULL, NULL}; private_dbus_interface_t *this = malloc_thing(private_dbus_interface_t); - this->public.interface.destroy = (void (*)(dbus_interface_t*))destroy; + this->public.interface.destroy = (void (*)(interface_t*))destroy; dbus_error_init(&this->err); this->conn = dbus_bus_get(DBUS_BUS_SYSTEM, &this->err); @@ -320,5 +414,5 @@ interface_t *interface_create() charon->kill(charon, "unable to create stroke thread"); } - return &this->public; + return &this->public.interface; } |