| … | |
… | |
| 88 | ); |
88 | ); |
| 89 | } |
89 | } |
| 90 | |
90 | |
| 91 | conf_node::~conf_node () |
91 | conf_node::~conf_node () |
| 92 | { |
92 | { |
|
|
93 | #if 0 |
|
|
94 | // does not work, because string pointers etc. are shared |
|
|
95 | // is not called, however |
| 93 | if (rsa_key) |
96 | if (rsa_key) |
| 94 | RSA_free (rsa_key); |
97 | RSA_free (rsa_key); |
| 95 | |
98 | |
| 96 | free (nodename); |
99 | free (nodename); |
| 97 | free (hostname); |
100 | free (hostname); |
|
|
101 | free (if_up_data); |
| 98 | #if ENABLE_DNS |
102 | #if ENABLE_DNS |
| 99 | free (domain); |
103 | free (domain); |
| 100 | free (dns_hostname); |
104 | free (dns_hostname); |
|
|
105 | #endif |
| 101 | #endif |
106 | #endif |
| 102 | } |
107 | } |
| 103 | |
108 | |
| 104 | void configuration::init () |
109 | void configuration::init () |
| 105 | { |
110 | { |
| … | |
… | |
| 118 | default_node.tcp_port = DEFAULT_UDPPORT; // ehrm |
123 | default_node.tcp_port = DEFAULT_UDPPORT; // ehrm |
| 119 | default_node.connectmode = conf_node::C_ALWAYS; |
124 | default_node.connectmode = conf_node::C_ALWAYS; |
| 120 | default_node.compress = true; |
125 | default_node.compress = true; |
| 121 | default_node.protocols = 0; |
126 | default_node.protocols = 0; |
| 122 | default_node.max_retry = DEFAULT_MAX_RETRY; |
127 | default_node.max_retry = DEFAULT_MAX_RETRY; |
|
|
128 | default_node.if_up_data = strdup (""); |
| 123 | |
129 | |
| 124 | #if ENABLE_DNS |
130 | #if ENABLE_DNS |
| 125 | default_node.dns_port = 0; // default is 0 == client |
131 | default_node.dns_port = 0; // default is 0 == client |
| 126 | |
132 | |
| 127 | dns_forw_host = strdup ("127.0.0.1"); |
133 | dns_forw_host = strdup ("127.0.0.1"); |
| … | |
… | |
| 406 | { |
412 | { |
| 407 | #if ENABLE_DNS |
413 | #if ENABLE_DNS |
| 408 | free (node->domain), node->domain = strdup (val); |
414 | free (node->domain), node->domain = strdup (val); |
| 409 | #endif |
415 | #endif |
| 410 | } |
416 | } |
|
|
417 | else if (!strcmp (var, "if-up-data")) |
|
|
418 | free (node->if_up_data), node->if_up_data = strdup (val); |
| 411 | else if (!strcmp (var, "router-priority")) |
419 | else if (!strcmp (var, "router-priority")) |
| 412 | node->routerprio = atoi (val); |
420 | node->routerprio = atoi (val); |
| 413 | else if (!strcmp (var, "max-retry")) |
421 | else if (!strcmp (var, "max-retry")) |
| 414 | node->max_retry = atoi (val); |
422 | node->max_retry = atoi (val); |
| 415 | else if (!strcmp (var, "connect")) |
423 | else if (!strcmp (var, "connect")) |
