conn_mgr.h: document in ll_queue style; config_parser/utun_instance updates

src/config_parser.c

@@ -47,7 +47,8 @@ typedef enum {
     SECTION_NAT,
     SECTION_TCP_PROXY_CLIENT,
     SECTION_TCP_PROXY_SERVER,
-    SECTION_MSG_TRANSPORT
+    SECTION_MSG_TRANSPORT,
+    SECTION_NETWORK
 } section_type_t;
 
 static char* trim(char *str) {
@@ -716,6 +717,21 @@ static int parse_client(const char *key, const char *value, struct CFG_CLIENT *c
     return -1;
 }
 
+static int parse_network(const char *key, const char *value, struct CFG_NETWORK *net, const char *filename, int line_num) {
+    if (strcmp(key, "id") == 0) {
+        net->id = strtoull(value, NULL, 16);
+        return 0;
+    }
+    if (strcmp(key, "pubkey") == 0) {
+        return assign_string(net->pubkey_hex, sizeof(net->pubkey_hex), value);
+    }
+    if (strcmp(key, "signing_key") == 0) {
+        return assign_string(net->signing_key_hex, sizeof(net->signing_key_hex), value);
+    }
+    DEBUG_ERROR(DEBUG_CATEGORY_CONFIG, "%s:%d: Unknown network option '%s'. Valid: id, pubkey, signing_key", filename, line_num, key);
+    return -1;
+}
+
 static section_type_t parse_section_header(const char *line, char *name, size_t name_len) {
     if (line[0] != '[') return SECTION_UNKNOWN;
     
@@ -752,7 +768,8 @@ static section_type_t parse_section_header(const char *line, char *name, size_t
     
     if (strcasecmp(type, "server") == 0) return SECTION_SERVER;
     if (strcasecmp(type, "client") == 0) return SECTION_CLIENT;
-    
+    if (strcasecmp(type, "network") == 0) return SECTION_NETWORK;
+
     return SECTION_UNKNOWN;
 }
 
@@ -779,6 +796,7 @@ static struct utun_config* parse_config_internal(FILE *fp, const char *filename)
     section_type_t cur_section = SECTION_UNKNOWN;
     struct CFG_SERVER *cur_server = NULL;
     struct CFG_CLIENT *cur_client = NULL;
+    struct CFG_NETWORK *cur_network = NULL;
     char line[MAX_LINE_LEN];
     int line_num = 0;
     
@@ -802,6 +820,11 @@ static struct utun_config* parse_config_internal(FILE *fp, const char *filename)
                 cfg->clients = cur_client;
                 cur_client = NULL;
             }
+            if (cur_section == SECTION_NETWORK && cur_network) {
+                cur_network->next = cfg->networks;
+                cfg->networks = cur_network;
+                cur_network = NULL;
+            }
             
             char name[MAX_CONN_NAME_LEN];
             cur_section = parse_section_header(trimmed, name, sizeof(name));
@@ -821,6 +844,13 @@ static struct utun_config* parse_config_internal(FILE *fp, const char *filename)
                     goto error;
                 }
                 strcpy(cur_client->name, name);
+            } else if (cur_section == SECTION_NETWORK) {
+                cur_network = u_calloc(1, sizeof(struct CFG_NETWORK));
+                if (!cur_network) {
+                    DEBUG_ERROR(DEBUG_CATEGORY_MEMORY, "parse_config_internal: failed to allocate memory for network %s", name);
+                    goto error;
+                }
+                strcpy(cur_network->name, name);
             }
             continue;
         }
@@ -927,6 +957,11 @@ static struct utun_config* parse_config_internal(FILE *fp, const char *filename)
                     // parse_msg_transport already printed the error
                 }
                 break;
+            case SECTION_NETWORK:
+                if (cur_network && parse_network(key, value, cur_network, filename, line_num) < 0) {
+                    // parse_network already printed the error
+                }
+                break;
             default:
                 DEBUG_WARN(DEBUG_CATEGORY_CONFIG, "%s:%d: Key outside section: %s", filename, line_num, key);
                 break;
@@ -942,6 +977,10 @@ static struct utun_config* parse_config_internal(FILE *fp, const char *filename)
         cur_client->next = cfg->clients;
         cfg->clients = cur_client;
     }
+    if (cur_section == SECTION_NETWORK && cur_network) {
+        cur_network->next = cfg->networks;
+        cfg->networks = cur_network;
+    }
     
     // Post-parse defaults: tun_enabled=1 if not explicitly disabled
     if (!cfg->global.tun_enabled && cfg->global.tun_ifname[0] == '\0' && cfg->global.tun_ip.family == AF_UNSPEC) {
@@ -965,6 +1004,7 @@ error:
         free_cfg_client_links(cur_client->links);
         u_free(cur_client);
     }
+    if (cur_network) u_free(cur_network);
     free_config(cfg);
     return NULL;
 }
@@ -1003,6 +1043,14 @@ void free_config(struct utun_config *config) {
         client = next;
     }
     
+    // Free networks
+    struct CFG_NETWORK *network = config->networks;
+    while (network) {
+        struct CFG_NETWORK *next = network->next;
+        u_free(network);
+        network = next;
+    }
+    
     // Free route entries
     free_route_entries(config->route_subnets);
     free_route_entries(config->my_subnets);
@@ -1097,8 +1145,16 @@ void print_config(const struct utun_config *cfg) {
                 DEBUG_INFO(DEBUG_CATEGORY_CONFIG, "  allow=%s", ip_str);
             } else {
                 DEBUG_INFO(DEBUG_CATEGORY_CONFIG, "  allow=%s:%d", ip_str, r->port);
-            }
-        }
+    }
+    
+    DEBUG_INFO(DEBUG_CATEGORY_CONFIG, "Networks:");
+    struct CFG_NETWORK *net = cfg->networks;
+    while (net) {
+        DEBUG_INFO(DEBUG_CATEGORY_CONFIG, "  [network:%s] id=%012llx pubkey=%.64s signing_key=%.64s",
+                   net->name, (unsigned long long)net->id, net->pubkey_hex, net->signing_key_hex);
+        net = net->next;
+    }
+}
     } else {
         DEBUG_INFO(DEBUG_CATEGORY_CONFIG, "  no rules");
     }