ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-19 05:07:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow client to specify external interface name in config match expression

Browse Source
This commit is contained in:
Jeremy Lakeman 2016-10-25 10:45:33 +10:30
parent 176de6fa42
commit 9feda5258c
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
overlay_mdp.c
View File

@ -1302,8 +1302,6 @@ static int mdp_search_identities(struct socket_address *client, struct mdp_heade
return 0; return 0;
} }
const char *external_name="ext"; // TODO?
int mdp_send_external_packet(struct overlay_interface *interface, struct socket_address *address, const uint8_t *payload, size_t len) int mdp_send_external_packet(struct overlay_interface *interface, struct socket_address *address, const uint8_t *payload, size_t len)
{ {
struct mdp_header header; struct mdp_header header;
@ -1362,37 +1360,43 @@ static void mdp_interface_packet(struct socket_address *client, struct mdp_heade
case MDP_INTERFACE_UP:{ case MDP_INTERFACE_UP:{
struct config_network_interface ifconfig; struct config_network_interface ifconfig;
cf_dfl_config_network_interface(&ifconfig); cf_dfl_config_network_interface(&ifconfig);
struct cf_om_node *conf_node = NULL; struct cf_om_node *conf_node = NULL;
int result = cf_om_parse(external_name, (char*)ob_current_ptr(payload), ob_remaining(payload), &conf_node); int result = cf_om_parse("ext", (char*)ob_current_ptr(payload), ob_remaining(payload), &conf_node);
if (result == CFOK || result == CFEMPTY){ if (result == CFOK || result == CFEMPTY){
result = conf_node ? cf_opt_config_network_interface(&ifconfig, conf_node) : CFEMPTY; result = conf_node ? cf_opt_config_network_interface(&ifconfig, conf_node) : CFEMPTY;
} }
if (result == CFOK || result == CFEMPTY){ if ((result == CFOK || result == CFEMPTY)
if (ifconfig.socket_type != SOCK_EXT){ && ifconfig.socket_type != SOCK_EXT){
// TODO log nice warning, pick right result code // TODO log nice warning, pick right result code
result |= CFSUB(CFUNSUPPORTED); result |= CFSUB(CFUNSUPPORTED);
} }
if ((result == CFOK || result == CFEMPTY)
&& ifconfig.match.patc == 0){
ifconfig.match.patc=1;
strncpy_nul(ifconfig.match.patv[0], "ext", INTERFACE_NAME_STRLEN);
} }
if (result == CFOK || result == CFEMPTY){ if (result == CFOK || result == CFEMPTY){
struct overlay_interface *interface=overlay_interface_find_name_addr(external_name, client); struct overlay_interface *interface=overlay_interface_find_name_addr(NULL, client);
if (!interface){ if (!interface){
overlay_interface_init(external_name, client, NULL, NULL, &ifconfig); overlay_interface_init(ifconfig.match.patv[0], client, NULL, NULL, &ifconfig);
}else{ }else{
// reconfigure the interface with new / current settings
if (overlay_interface_configure(interface, &ifconfig)==-1) if (overlay_interface_configure(interface, &ifconfig)==-1)
overlay_interface_close(interface); overlay_interface_close(interface);
} }
} }
}break; }break;
case MDP_INTERFACE_DOWN:{ case MDP_INTERFACE_DOWN:{
struct overlay_interface *interface=overlay_interface_find_name_addr(external_name, client); struct overlay_interface *interface=overlay_interface_find_name_addr(NULL, client);
if (interface) if (interface)
overlay_interface_close(interface); overlay_interface_close(interface);
}break; }break;
case MDP_INTERFACE_RECV:{ case MDP_INTERFACE_RECV:{
struct overlay_interface *interface=overlay_interface_find_name_addr(external_name, client); struct overlay_interface *interface=overlay_interface_find_name_addr(NULL, client);
if (interface){ if (interface){
struct socket_address addr; struct socket_address addr;
addr.addrlen = ob_get(payload); addr.addrlen = ob_get(payload);