External/libvirt
1
0
Fork 0
Code

Add access to elements of variables via index

Browse Source 
This patch adds access to single elements of variables via index. Example:

  <rule action='accept' direction='in' priority='500'>
    <tcp srcipaddr='$ADDR[1]' srcportstart='$B[2]'/>
  </rule>
This commit is contained in:
Stefan Berger 2012-01-11 06:42:37 -05:00 committed by Stefan Berger
parent 80e9a5cd4c
commit caa6223a9b
2 changed files with 71 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/conf/nwfilter_params.c
View File

@ -35,7 +35,10 @@
#define VIR_FROM_THIS VIR_FROM_NWFILTER #define VIR_FROM_THIS VIR_FROM_NWFILTER
static bool isValidVarValue(const char *value); static bool isValidVarValue(const char *value);
static void virNWFilterVarAccessSetIntIterId(virNWFilterVarAccessPtr,
unsigned int);
static unsigned int virNWFilterVarAccessGetIntIterId(
const virNWFilterVarAccessPtr);
void void
virNWFilterVarValueFree(virNWFilterVarValuePtr val) virNWFilterVarValueFree(virNWFilterVarValuePtr val)
@ -313,7 +316,7 @@ virNWFilterVarCombIterAddVariable(virNWFilterVarCombIterEntryPtr cie,
const virNWFilterVarAccessPtr varAccess) const virNWFilterVarAccessPtr varAccess)
{ {
virNWFilterVarValuePtr varValue; virNWFilterVarValuePtr varValue;
unsigned int cardinality; unsigned int maxValue, minValue;
const char *varName = virNWFilterVarAccessGetVarName(varAccess); const char *varName = virNWFilterVarAccessGetVarName(varAccess);
varValue = virHashLookup(hash->hashTable, varName); varValue = virHashLookup(hash->hashTable, varName);
@ -324,12 +327,25 @@ virNWFilterVarCombIterAddVariable(virNWFilterVarCombIterEntryPtr cie,
return -1; return -1;
} }
cardinality = virNWFilterVarValueGetCardinality(varValue); switch (virNWFilterVarAccessGetType(varAccess)) {
case VIR_NWFILTER_VAR_ACCESS_ELEMENT:
maxValue = virNWFilterVarAccessGetIndex(varAccess);
minValue = maxValue;
break;
case VIR_NWFILTER_VAR_ACCESS_ITERATOR:
maxValue = virNWFilterVarValueGetCardinality(varValue) - 1;
minValue = 0;
break;
case VIR_NWFILTER_VAR_ACCESS_LAST:
return -1;
}
if (cie->nVarNames == 0) { if (cie->nVarNames == 0) {
cie->maxValue = cardinality - 1; cie->maxValue = maxValue;
cie->minValue = minValue;
cie->curValue = minValue;
} else { } else {
if (cie->maxValue != cardinality - 1) { if (cie->maxValue != maxValue) {
virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, virNWFilterReportError(VIR_ERR_INTERNAL_ERROR,
_("Cardinality of list items must be " _("Cardinality of list items must be "
"the same for processing them in " "the same for processing them in "
@ -410,12 +426,13 @@ virNWFilterVarCombIterEntryAreUniqueEntries(virNWFilterVarCombIterEntryPtr cie,
*/ */
virNWFilterVarCombIterPtr virNWFilterVarCombIterPtr
virNWFilterVarCombIterCreate(virNWFilterHashTablePtr hash, virNWFilterVarCombIterCreate(virNWFilterHashTablePtr hash,
const virNWFilterVarAccessPtr *varAccess, virNWFilterVarAccessPtr *varAccess,
size_t nVarAccess) size_t nVarAccess)
{ {
virNWFilterVarCombIterPtr res; virNWFilterVarCombIterPtr res;
unsigned int i, iterId; unsigned int i, iterId;
int iterIndex = -1; int iterIndex = -1;
unsigned int nextIntIterId = VIR_NWFILTER_MAX_ITERID + 1;
if (VIR_ALLOC_VAR(res, virNWFilterVarCombIterEntry, 1 + nVarAccess) < 0) { if (VIR_ALLOC_VAR(res, virNWFilterVarCombIterEntry, 1 + nVarAccess) < 0) {
virReportOOMError(); virReportOOMError();
@ -442,6 +459,13 @@ virNWFilterVarCombIterCreate(virNWFilterHashTablePtr hash,
} }
break; break;
case VIR_NWFILTER_VAR_ACCESS_ELEMENT: case VIR_NWFILTER_VAR_ACCESS_ELEMENT:
iterIndex = res->nIter;
virNWFilterVarAccessSetIntIterId(varAccess[i], nextIntIterId);
virNWFilterVarCombIterEntryInit(&res->iter[iterIndex],
nextIntIterId);
nextIntIterId++;
res->nIter++;
break;
case VIR_NWFILTER_VAR_ACCESS_LAST: case VIR_NWFILTER_VAR_ACCESS_LAST:
break; break;
} }
@ -472,7 +496,7 @@ next:
goto next; goto next;
break; break;
} else { } else {
ci->iter[i].curValue = 0; ci->iter[i].curValue = ci->iter[i].minValue;
} }
} }
@ -507,9 +531,15 @@ virNWFilterVarCombIterGetVarValue(virNWFilterVarCombIterPtr ci,
} }
break; break;
case VIR_NWFILTER_VAR_ACCESS_ELEMENT: case VIR_NWFILTER_VAR_ACCESS_ELEMENT:
virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, iterId = virNWFilterVarAccessGetIntIterId(vap);
_("Element access via index is not possible")); iterIndex = virNWFilterVarCombIterGetIndexByIterId(ci, iterId);
return NULL; if (iterIndex < 0) {
virNWFilterReportError(VIR_ERR_INTERNAL_ERROR,
_("Could not get iterator index for "
"(internal) iterator ID %u"), iterId);
return NULL;
}
break;
case VIR_NWFILTER_VAR_ACCESS_LAST: case VIR_NWFILTER_VAR_ACCESS_LAST:
return NULL; return NULL;
} }
@ -874,7 +904,8 @@ virNWFilterVarAccessEqual(const virNWFilterVarAccessPtr a,
switch (a->accessType) { switch (a->accessType) {
case VIR_NWFILTER_VAR_ACCESS_ELEMENT: case VIR_NWFILTER_VAR_ACCESS_ELEMENT:
return (a->u.index == b->u.index); return (a->u.index.index == b->u.index.index &&
a->u.index.intIterId == b->u.index.intIterId);
break; break;
case VIR_NWFILTER_VAR_ACCESS_ITERATOR: case VIR_NWFILTER_VAR_ACCESS_ITERATOR:
return (a->u.iterId == b->u.iterId); return (a->u.iterId == b->u.iterId);
@ -938,11 +969,6 @@ virNWFilterVarAccessParse(const char *varAccess)
} else { } else {
/* in the form 'IP[<number>] -> element */ /* in the form 'IP[<number>] -> element */
dest->accessType = VIR_NWFILTER_VAR_ACCESS_ELEMENT; dest->accessType = VIR_NWFILTER_VAR_ACCESS_ELEMENT;
/* not supported (yet) */
virNWFilterReportError(VIR_ERR_INVALID_ARG,
_("Variable access in the form "
"var[<index>] is not supported"));
goto err_exit;
} }
if (virStrToLong_ui(input, &end_ptr, 10, &result) < 0) if (virStrToLong_ui(input, &end_ptr, 10, &result) < 0)
@ -965,7 +991,8 @@ virNWFilterVarAccessParse(const char *varAccess)
switch (dest->accessType) { switch (dest->accessType) {
case VIR_NWFILTER_VAR_ACCESS_ELEMENT: case VIR_NWFILTER_VAR_ACCESS_ELEMENT:
dest->u.index = result; dest->u.index.index = result;
dest->u.index.intIterId = ~0;
break; break;
case VIR_NWFILTER_VAR_ACCESS_ITERATOR: case VIR_NWFILTER_VAR_ACCESS_ITERATOR:
if (result > VIR_NWFILTER_MAX_ITERID) { if (result > VIR_NWFILTER_MAX_ITERID) {
@ -998,7 +1025,7 @@ virNWFilterVarAccessPrint(virNWFilterVarAccessPtr vap, virBufferPtr buf)
virBufferAdd(buf, vap->varName, -1); virBufferAdd(buf, vap->varName, -1);
switch (vap->accessType) { switch (vap->accessType) {
case VIR_NWFILTER_VAR_ACCESS_ELEMENT: case VIR_NWFILTER_VAR_ACCESS_ELEMENT:
virBufferAsprintf(buf, "[%u]", vap->u.index); virBufferAsprintf(buf, "[%u]", vap->u.index.index);
break; break;
case VIR_NWFILTER_VAR_ACCESS_ITERATOR: case VIR_NWFILTER_VAR_ACCESS_ITERATOR:
if (vap->u.iterId != 0) if (vap->u.iterId != 0)
@ -1026,3 +1053,22 @@ virNWFilterVarAccessGetIterId(const virNWFilterVarAccessPtr vap)
{ {
return vap->u.iterId; return vap->u.iterId;
} }
unsigned int
virNWFilterVarAccessGetIndex(const virNWFilterVarAccessPtr vap)
{
return vap->u.index.index;
}
static void
virNWFilterVarAccessSetIntIterId(virNWFilterVarAccessPtr vap,
unsigned int intIterId)
{
vap->u.index.intIterId = intIterId;
}
static unsigned int
virNWFilterVarAccessGetIntIterId(const virNWFilterVarAccessPtr vap)
{
return vap->u.index.intIterId;
}

9
src/conf/nwfilter_params.h
View File

@ -103,7 +103,10 @@ typedef virNWFilterVarAccess *virNWFilterVarAccessPtr;
struct _virNWFilterVarAccess { struct _virNWFilterVarAccess {
enum virNWFilterVarAccessType accessType; enum virNWFilterVarAccessType accessType;
union { union {
unsigned int index; struct {
unsigned int index;
unsigned int intIterId;
} index;
unsigned int iterId; unsigned int iterId;
} u; } u;
char *varName; char *varName;
@ -121,6 +124,7 @@ const char *virNWFilterVarAccessGetVarName(const virNWFilterVarAccessPtr vap);
enum virNWFilterVarAccessType virNWFilterVarAccessGetType( enum virNWFilterVarAccessType virNWFilterVarAccessGetType(
const virNWFilterVarAccessPtr vap); const virNWFilterVarAccessPtr vap);
unsigned int virNWFilterVarAccessGetIterId(const virNWFilterVarAccessPtr vap); unsigned int virNWFilterVarAccessGetIterId(const virNWFilterVarAccessPtr vap);
unsigned int virNWFilterVarAccessGetIndex(const virNWFilterVarAccessPtr vap);
typedef struct _virNWFilterVarCombIterEntry virNWFilterVarCombIterEntry; typedef struct _virNWFilterVarCombIterEntry virNWFilterVarCombIterEntry;
@ -131,6 +135,7 @@ struct _virNWFilterVarCombIterEntry {
size_t nVarNames; size_t nVarNames;
unsigned int maxValue; unsigned int maxValue;
unsigned int curValue; unsigned int curValue;
unsigned int minValue;
}; };
typedef struct _virNWFilterVarCombIter virNWFilterVarCombIter; typedef struct _virNWFilterVarCombIter virNWFilterVarCombIter;
@ -142,7 +147,7 @@ struct _virNWFilterVarCombIter {
}; };
virNWFilterVarCombIterPtr virNWFilterVarCombIterCreate( virNWFilterVarCombIterPtr virNWFilterVarCombIterCreate(
virNWFilterHashTablePtr hash, virNWFilterHashTablePtr hash,
const virNWFilterVarAccessPtr *vars, virNWFilterVarAccessPtr *vars,
size_t nVars); size_t nVars);
void virNWFilterVarCombIterFree(virNWFilterVarCombIterPtr ci); void virNWFilterVarCombIterFree(virNWFilterVarCombIterPtr ci);