search for: get_config_str

...vice.c @@ -33,6 +33,7 @@ #endif #define DEFAULT_DEVICE "/dev/tun0" +#define DEFAULT_DEVICE_TAP "/dev/tap0" typedef enum device_type { DEVICE_TYPE_TUN, @@ -60,8 +61,12 @@ static device_type_t device_type = DEVICE_TYPE_TUN; bool setup_device(void) { char *type; - if(!get_config_string(lookup_config(config_tree, "Device"), &device)) - device = xstrdup(DEFAULT_DEVICE); + if(!get_config_string(lookup_config(config_tree, "Device"), &device)) { + if (routing_mode != RMODE_ROUTER) + device = xstrdup(DEFAULT_DEVICE_TAP); + else + device = xstrdup(D...

...xen/xend/XendOptions.py Mon Apr 26 12:13:23 2010 +0100 +++ b/tools/python/xen/xend/XendOptions.py Wed Apr 28 16:54:04 2010 +0200 @@ -207,18 +207,18 @@ def get_xend_tcp_xmlrpc_server_ssl_key_file(self): name = ''xend-tcp-xmlrpc-server-ssl-key-file'' file = self.get_config_string(name) - if os.path.dirname(file) == "": + if file and os.path.dirname(file) == "": file = auxbin.xen_configdir() + ''/'' + file; - if not os.path.exists(file): + if file and not os.path.exists(file): raise...

...Patch: --- a/tools/python/xen/xend/XendOptions.py Mon Apr 26 12:13:23 2010 +0100 +++ b/tools/python/xen/xend/XendOptions.py Wed Apr 28 16:54:04 2010 +0200 @@ -207,18 +207,18 @@ def get_xend_tcp_xmlrpc_server_ssl_key_file(self): name = 'xend-tcp-xmlrpc-server-ssl-key-file' file = self.get_config_string(name) - if os.path.dirname(file) == "": + if file and os.path.dirname(file) == "": file = auxbin.xen_configdir() + '/' + file; - if not os.path.exists(file): + if file and not os.path.exists(file): raise XendError("invalid xend config %s: directory '%s&...

...ly set the name of the interface. diff --git a/src/linux/device.c b/src/linux/device.c index 6c828c0..0632d51 100644 --- a/src/linux/device.c +++ b/src/linux/device.c @@ -52,6 +52,7 @@ static uint64_t device_total_out = 0; bool setup_device(void) { struct ifreq ifr; + bool t1q = false; if(!get_config_string(lookup_config(config_tree, "Device"), &device)) device = xstrdup(DEFAULT_DEVICE); @@ -84,6 +85,12 @@ bool setup_device(void) { device_info = "Linux tun/tap device (tap mode)"; } +#ifdef IFF_ONE_QUEUE + /* Set IFF_ONE_QUEUE flag... */ + if(get_config_bool(lookup_...

...r <octo at verplant.org> --- src/linux/device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/linux/device.c b/src/linux/device.c index 2e44755..4e9591c 100644 --- a/src/linux/device.c +++ b/src/linux/device.c @@ -63,7 +63,8 @@ bool setup_device(void) if(!get_config_string(lookup_config(config_tree, "Interface"), &iface)) #ifdef HAVE_LINUX_IF_TUN_H - iface = xstrdup(netname); + if (netname != NULL) + iface = xstrdup(netname); #else iface = xstrdup(rindex(device, '/') ? rindex(device, '/') + 1 : device); #endif -- 1.5.6.5

...K); + } while (device_fd < 0 && device_nr < DEVICE_TRIES_MAX); + if (device_fd >= 0) + device = device_buf; + } + } + if (device_fd < 0) { + logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno)); + return false; + } } if(get_config_string(lookup_config(config_tree, "DeviceType"), &type)) {

...char *variable; @@ -40,6 +41,7 @@ extern int maxtimeout; extern bool bypass_security; extern char *confbase; extern char *netname; +extern list_t *cmdline_conf; extern void init_configuration(avl_tree_t **); extern void exit_configuration(avl_tree_t **); @@ -54,6 +56,7 @@ extern bool get_config_string(const config_t *, char **); extern bool get_config_address(const config_t *, struct addrinfo **); extern bool get_config_subnet(const config_t *, struct subnet_t **); +extern config_t *parse_config_line(char *, const char *, int); extern bool read_config_file(avl_tree_t *, const char *);...

(Second try to send this. I wonder if the first one gotten eaten by a spam filter; I'll link to patches instead of attaching them.) Here are the tincctl patches I've been working on. They apply to http://www.tinc-vpn.org/svn/tinc/branches/1.1@1545. I intend to commit them once the crypto stuff's fixed. Since they're basically done, I'm emailing them now for review and in case

A character device for accessing (in user-space) pages that have been granted by other domains. Signed-off-by: Derek Murray <Derek.Murray@cl.cam.ac.uk> _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel