External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

* src/network_conf.c src/network_conf.h src/qemu_driver.c: allow to

Browse Source 
add static host definition for dnsmasq
Daniel
This commit is contained in:
Daniel Veillard 2008-08-20 12:50:29 +00:00
parent 1b4bb7d4ab
commit b73d495754
4 changed files with 127 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Aug 20 14:49:29 CEST 2008 Daniel Veillard <veillard@redhat.com>
* src/network_conf.c src/network_conf.h src/qemu_driver.c: allow to
add static host definition for dnsmasq
Wed Aug 20 10:16:54 BST 2008 Daniel P. Berrange <berrange@redhat.com> Wed Aug 20 10:16:54 BST 2008 Daniel P. Berrange <berrange@redhat.com>
* src/util.c, src/util.h: Allow flags to be passed to specify * src/util.c, src/util.h: Allow flags to be passed to specify

115
src/network_conf.c
View File

@ -40,6 +40,7 @@
#include "uuid.h" #include "uuid.h"
#include "util.h" #include "util.h"
#include "buf.h" #include "buf.h"
#include "c-ctype.h"
VIR_ENUM_DECL(virNetworkForward) VIR_ENUM_DECL(virNetworkForward)
@ -115,6 +116,13 @@ void virNetworkDefFree(virNetworkDefPtr def)
} }
VIR_FREE(def->ranges); VIR_FREE(def->ranges);
for (i = 0 ; i < def->nhosts && def->hosts ; i++) {
VIR_FREE(def->hosts[i].mac);
VIR_FREE(def->hosts[i].ip);
VIR_FREE(def->hosts[i].name);
}
VIR_FREE(def->hosts);
VIR_FREE(def); VIR_FREE(def);
} }
@ -197,33 +205,82 @@ virNetworkDHCPRangeDefParseXML(virConnectPtr conn,
cur = node->children; cur = node->children;
while (cur != NULL) { while (cur != NULL) {
xmlChar *start, *end; if (cur->type == XML_ELEMENT_NODE &&
xmlStrEqual(cur->name, BAD_CAST "range")) {
xmlChar *start, *end;
if (cur->type != XML_ELEMENT_NODE || if (!(start = xmlGetProp(cur, BAD_CAST "start"))) {
!xmlStrEqual(cur->name, BAD_CAST "range")) { cur = cur->next;
cur = cur->next; continue;
continue; }
} if (!(end = xmlGetProp(cur, BAD_CAST "end"))) {
cur = cur->next;
xmlFree(start);
continue;
}
if (!(start = xmlGetProp(cur, BAD_CAST "start"))) { if (VIR_REALLOC_N(def->ranges, def->nranges + 1) < 0) {
cur = cur->next; xmlFree(start);
continue; xmlFree(end);
} virNetworkReportError(conn, VIR_ERR_NO_MEMORY, NULL);
if (!(end = xmlGetProp(cur, BAD_CAST "end"))) { return -1;
cur = cur->next; }
xmlFree(start); def->ranges[def->nranges].start = (char *)start;
continue; def->ranges[def->nranges].end = (char *)end;
} def->nranges++;
} else if (cur->type == XML_ELEMENT_NODE &&
xmlStrEqual(cur->name, BAD_CAST "host")) {
xmlChar *mac, *name, *ip;
unsigned char addr[6];
struct in_addr inaddress;
if (VIR_REALLOC_N(def->ranges, def->nranges + 1) < 0) { mac = xmlGetProp(cur, BAD_CAST "mac");
xmlFree(start); if ((mac != NULL) &&
xmlFree(end); (virParseMacAddr((const char *) mac, &addr[0]) != 0)) {
virNetworkReportError(conn, VIR_ERR_NO_MEMORY, NULL); virNetworkReportError(conn, VIR_ERR_INTERNAL_ERROR,
return -1; _("cannot parse MAC address '%s'"),
mac);
VIR_FREE(mac);
}
name = xmlGetProp(cur, BAD_CAST "name");
if ((name != NULL) && (!c_isalpha(name[0]))) {
virNetworkReportError(conn, VIR_ERR_INTERNAL_ERROR,
_("cannot use name address '%s'"),
name);
VIR_FREE(name);
}
/*
* You need at least one MAC address or one host name
*/
if ((mac == NULL) && (name == NULL)) {
VIR_FREE(mac);
VIR_FREE(name);
cur = cur->next;
continue;
}
ip = xmlGetProp(cur, BAD_CAST "ip");
if (inet_pton(AF_INET, (const char *) ip, &inaddress) <= 0) {
virNetworkReportError(conn, VIR_ERR_INTERNAL_ERROR,
_("cannot parse IP address '%s'"),
ip);
VIR_FREE(ip);
VIR_FREE(mac);
VIR_FREE(name);
cur = cur->next;
continue;
}
if (VIR_REALLOC_N(def->hosts, def->nhosts + 1) < 0) {
VIR_FREE(ip);
VIR_FREE(mac);
VIR_FREE(name);
virNetworkReportError(conn, VIR_ERR_NO_MEMORY, NULL);
return -1;
}
def->hosts[def->nhosts].mac = (char *)mac;
def->hosts[def->nhosts].name = (char *)name;
def->hosts[def->nhosts].ip = (char *)ip;
def->nhosts++;
} }
def->ranges[def->nranges].start = (char *)start;
def->ranges[def->nranges].end = (char *)end;
def->nranges++;
cur = cur->next; cur = cur->next;
} }
@ -524,12 +581,22 @@ char *virNetworkDefFormat(virConnectPtr conn,
virBufferAddLit(&buf, ">\n"); virBufferAddLit(&buf, ">\n");
if (def->nranges) { if ((def->nranges || def->nhosts)) {
int i; int i;
virBufferAddLit(&buf, " <dhcp>\n"); virBufferAddLit(&buf, " <dhcp>\n");
for (i = 0 ; i < def->nranges ; i++) for (i = 0 ; i < def->nranges ; i++)
virBufferVSprintf(&buf, " <range start='%s' end='%s' />\n", virBufferVSprintf(&buf, " <range start='%s' end='%s' />\n",
def->ranges[i].start, def->ranges[i].end); def->ranges[i].start, def->ranges[i].end);
for (i = 0 ; i < def->nhosts ; i++) {
virBufferAddLit(&buf, " <host ");
if (def->hosts[i].mac)
virBufferVSprintf(&buf, "mac='%s' ", def->hosts[i].mac);
if (def->hosts[i].name)
virBufferVSprintf(&buf, "name='%s' ", def->hosts[i].name);
if (def->hosts[i].ip)
virBufferVSprintf(&buf, "ip='%s' ", def->hosts[i].ip);
virBufferAddLit(&buf, "/>\n");
}
virBufferAddLit(&buf, " </dhcp>\n"); virBufferAddLit(&buf, " </dhcp>\n");
} }

11
src/network_conf.h
View File

@ -42,6 +42,14 @@ struct _virNetworkDHCPRangeDef {
char *end; char *end;
}; };
typedef struct _virNetworkDHCPHostDef virNetworkDHCPHostDef;
typedef virNetworkDHCPHostDef *virNetworkDHCPHostDefPtr;
struct _virNetworkDHCPHostDef {
char *mac;
char *name;
char *ip;
};
typedef struct _virNetworkDef virNetworkDef; typedef struct _virNetworkDef virNetworkDef;
typedef virNetworkDef *virNetworkDefPtr; typedef virNetworkDef *virNetworkDefPtr;
struct _virNetworkDef { struct _virNetworkDef {
@ -61,6 +69,9 @@ struct _virNetworkDef {
unsigned int nranges; /* Zero or more dhcp ranges */ unsigned int nranges; /* Zero or more dhcp ranges */
virNetworkDHCPRangeDefPtr ranges; virNetworkDHCPRangeDefPtr ranges;
unsigned int nhosts; /* Zero or more dhcp hosts */
virNetworkDHCPHostDefPtr hosts;
}; };
typedef struct _virNetworkObj virNetworkObj; typedef struct _virNetworkObj virNetworkObj;

20
src/qemu_driver.c
View File

@ -1107,6 +1107,8 @@ qemudBuildDnsmasqArgv(virConnectPtr conn,
2 + /* --listen-address 10.0.0.1 */ 2 + /* --listen-address 10.0.0.1 */
1 + /* --dhcp-leasefile=path */ 1 + /* --dhcp-leasefile=path */
(2 * network->def->nranges) + /* --dhcp-range 10.0.0.2,10.0.0.254 */ (2 * network->def->nranges) + /* --dhcp-range 10.0.0.2,10.0.0.254 */
/* --dhcp-host 01:23:45:67:89:0a,hostname,10.0.0.3 */
(2 * network->def->nhosts) +
1; /* NULL */ 1; /* NULL */
if (VIR_ALLOC_N(*argv, len) < 0) if (VIR_ALLOC_N(*argv, len) < 0)
@ -1168,6 +1170,24 @@ qemudBuildDnsmasqArgv(virConnectPtr conn,
APPEND_ARG(*argv, i++, buf); APPEND_ARG(*argv, i++, buf);
} }
for (r = 0 ; r < network->def->nhosts ; r++) {
virNetworkDHCPHostDefPtr host = &(network->def->hosts[r]);
if ((host->mac) && (host->name)) {
snprintf(buf, sizeof(buf), "%s,%s,%s",
host->mac, host->name, host->ip);
} else if (host->mac) {
snprintf(buf, sizeof(buf), "%s,%s",
host->mac, host->ip);
} else if (host->name) {
snprintf(buf, sizeof(buf), "%s,%s",
host->name, host->ip);
} else
continue;
APPEND_ARG(*argv, i++, "--dhcp-host");
APPEND_ARG(*argv, i++, buf);
}
#undef APPEND_ARG #undef APPEND_ARG
return 0; return 0;