summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into next-3.14Patrick McHardy2014-01-203-26/+128
|\
| * use new libnftnl library namePablo Neira Ayuso2014-01-202-9/+9
| * mnl: fix chain type autoloadingPablo Neira Ayuso2014-01-171-1/+1
| * datatype: add time type parser and adapt outputPablo Neira Ayuso2014-01-171-16/+118
* | Merge remote-tracking branch 'origin/master' into next-3.14Patrick McHardy2014-01-167-16/+72
|\|
| * set: make set initializer parsablePatrick McHardy2014-01-164-2/+27
| * set: make set flags output parsablePatrick McHardy2014-01-163-6/+35
| * src: use ':' instead of '=>' in dictionariesPablo Neira Ayuso2014-01-164-7/+5
| * src: add new --debug=mnl option to enable libmnl debuggingPablo Neira Ayuso2014-01-162-3/+7
* | parser: use symbolic expressions for parsing keywords as protocol valuesPatrick McHardy2014-01-161-16/+12
* | Merge remote-tracking branch 'origin/master' into next-3.14Patrick McHardy2014-01-166-12/+72
|\|
| * segtree: fix decomposition of unclosed intervalsPatrick McHardy2014-01-161-9/+30
| * segtree: only use prefix expressions for ranges for selected datatypesPatrick McHardy2014-01-163-1/+7
| * parser: fix compilation breakagePatrick McHardy2014-01-161-1/+1
| * expression: fix output of verdict mapsPablo Neira2014-01-161-1/+5
| * payload: fix inconsistency in ethertype outputPablo Neira Ayuso2014-01-161-1/+1
| * payload: fix crash when wrong ethernet protocol type is usedPablo Neira Ayuso2014-01-161-0/+1
| * parser: fix parsing of ethernet protocol typesPablo Neira Ayuso2014-01-161-0/+29
* | Merge remote-tracking branch 'origin/master' into next-3.14Patrick McHardy2014-01-154-18/+47
|\|
| * expr: relational: don't surpress '==' for LHS binops in outputPatrick McHardy2014-01-151-2/+4
| * netlink: use stdout for debuggingPablo Neira Ayuso2014-01-151-5/+5
| * segtree: add new segtree debugging optionPablo Neira Ayuso2014-01-152-11/+38
* | Merge branch 'master' into next-3.14Patrick McHardy2014-01-151-1/+1
|\|
| * payload: fix name of eth_protoPatrick McHardy2014-01-151-1/+1
* | Merge branch 'master' into next-3.14Patrick McHardy2014-01-152-28/+40
|\|
| * meta: fix mismergePatrick McHardy2014-01-151-2/+0
| * meta: don't require "meta" keyword for a subset of meta expressionsPatrick McHardy2014-01-152-4/+29
| * expr: remove secmark from ct and meta expressionPatrick McHardy2014-01-154-9/+0
| * scanner: add aliases to symbols for easier interaction with most shellsPablo Neira Ayuso2014-01-151-0/+12
| * nft: scanner: fixed problem with ipv6 addressAna Rey2014-01-151-25/+25
| * scanner: rename address selector from 'eth' to 'ether'Pablo Neira Ayuso2014-01-142-3/+3
* | meta: don't require "meta" keyword for a subset of meta expressionsPatrick McHardy2014-01-152-4/+29
* | expr: remove secmark from ct and meta expressionPatrick McHardy2014-01-154-9/+0
* | Merge remote-tracking branch 'origin/master' into next-3.14Patrick McHardy2014-01-142-1/+3
|\|
| * Revert "parser: replace "vmap" keyword by "map""Patrick McHardy2014-01-142-1/+3
* | Merge remote-tracking branch 'origin/master' into next-3.14Patrick McHardy2014-01-144-14/+12
|\|
| * parser: replace "vmap" keyword by "map"Patrick McHardy2014-01-142-3/+1
| * netlink: fix wrong type in attributesPablo Neira Ayuso2014-01-102-11/+11
* | Merge remote-tracking branch 'origin/master' into next-3.14Patrick McHardy2014-01-103-7/+7
|\|
| * meta: fix crash when parsing unresolvable mark valuesPatrick McHardy2014-01-101-0/+1
| * datatype: revert "fix crash if wrong integer type is passed"Patrick McHardy2014-01-101-4/+2
| * erec: fix error markup for errors starting at column 0Patrick McHardy2014-01-101-1/+2
| * nftables: shorten "could not process rule in batch" messagePatrick McHardy2014-01-101-2/+2
* | netlink_delinearize: fix compiler warningPatrick McHardy2014-01-091-1/+1
* | Merge remote-tracking branch 'origin/master' into next-3.14Patrick McHardy2014-01-092-7/+13
|\|
| * nftables: fix supression of "permission denied" errorsPatrick McHardy2014-01-092-7/+13
* | meta: add l4proto supportPatrick McHardy2014-01-085-0/+48
* | meta: add nfproto supportPatrick McHardy2014-01-086-10/+66
* | proto: add support for meta templatesPatrick McHardy2014-01-081-1/+5
* | netlink_delinearize: remove implied meta expressionsPatrick McHardy2014-01-081-6/+23