openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pass additional parameter into applyDHCPOnly function 

In preparation for the DHCP Snooping code:
Pass an additional parameter into the applyDHCPOnly function
of the 'techdriver'.
This commit is contained in:
Stefan Berger 2011-11-22 15:59:26 -05:00 committed by Stefan Berger
parent aa1cb7e706
commit 7ca82ecbea
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/conf/nwfilter_conf.h
View File

@ -630,7 +630,8 @@ typedef int (*virNWFilterApplyBasicRules)(const char *ifname,
typedef int (*virNWFilterApplyDHCPOnlyRules)(const char *ifname,
const unsigned char *macaddr,
const char *dhcpserver);
const char *dhcpserver,
bool leaveTemporary);
typedef int (*virNWFilterRemoveBasicRules)(const char *ifname);

13
src/nwfilter/nwfilter_ebiptables_driver.c
View File

@ -3191,6 +3191,9 @@ tear_down_tmpebchains:
* interface
* @dhcpserver: The DHCP server from which the VM may receive traffic
* from; may be NULL
* @leaveTemporary: Whether to leave the table names with their temporary
* names (true) or also perform the renaming to their final names as
* part of this call (false)
*
* Returns 0 on success, 1 on failure with the rules removed
*
@ -3200,7 +3203,8 @@ tear_down_tmpebchains:
static int
ebtablesApplyDHCPOnlyRules(const char *ifname,
const unsigned char *macaddr,
const char *dhcpserver)
const char *dhcpserver,
bool leaveTemporary)
{
virBuffer buf = VIR_BUFFER_INITIALIZER;
char chain_in [MAX_CHAINNAME_LENGTH],
@ -3281,8 +3285,11 @@ ebtablesApplyDHCPOnlyRules(const char *ifname,
ebtablesLinkTmpRootChain(&buf, 1, ifname, 1);
ebtablesLinkTmpRootChain(&buf, 0, ifname, 1);
ebtablesRenameTmpRootChain(&buf, 1, ifname);
ebtablesRenameTmpRootChain(&buf, 0, ifname);
if (!leaveTemporary) {
ebtablesRenameTmpRootChain(&buf, 1, ifname);
ebtablesRenameTmpRootChain(&buf, 0, ifname);
}
if (ebiptablesExecCLI(&buf, NULL, NULL) < 0)
goto tear_down_tmpebchains;

2
src/nwfilter/nwfilter_learnipaddr.c
View File

@ -460,7 +460,7 @@ learnIPAddressThread(void *arg)
case DETECT_DHCP:
if (techdriver->applyDHCPOnlyRules(req->ifname,
req->macaddr,
NULL)) {
NULL, false)) {
req->status = EINVAL;
goto done;
}