From 268532705150893cef4bdb4cb74f1c883c481652 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Thu, 18 Jul 2013 19:08:02 +0200 Subject: examples: add arp support While at it, convert all examples to use NFPROTO_*. Signed-off-by: Pablo Neira Ayuso --- examples/nft-chain-add.c | 10 ++++++---- examples/nft-chain-del.c | 10 ++++++---- examples/nft-chain-get.c | 11 +++++++---- examples/nft-rule-add.c | 11 +++++++---- examples/nft-rule-del.c | 11 +++++++---- examples/nft-set-add.c | 11 +++++++---- examples/nft-set-del.c | 11 +++++++---- examples/nft-set-elem-add.c | 11 +++++++---- examples/nft-set-elem-del.c | 11 +++++++---- examples/nft-set-elem-get.c | 11 +++++++---- examples/nft-set-get.c | 11 +++++++---- examples/nft-table-add.c | 11 +++++++---- examples/nft-table-del.c | 11 +++++++---- examples/nft-table-get.c | 11 +++++++---- examples/nft-table-upd.c | 11 +++++++---- 15 files changed, 103 insertions(+), 60 deletions(-) diff --git a/examples/nft-chain-add.c b/examples/nft-chain-add.c index 4897fc5..0bf8b43 100644 --- a/examples/nft-chain-add.c +++ b/examples/nft-chain-add.c @@ -37,13 +37,15 @@ int main(int argc, char *argv[]) } if (strcmp(argv[1], "ip") == 0) - family = AF_INET; + family = NFPROTO_IPV4; else if (strcmp(argv[1], "ip6") == 0) - family = AF_INET6; + family = NFPROTO_IPV6; else if (strcmp(argv[1], "bridge") == 0) - family = AF_BRIDGE; + family = NFPROTO_BRIDGE; + else if (strcmp(argv[1], "arp") == 0) + family = NFPROTO_ARP; else { - fprintf(stderr, "Unknown family: ip, ip6, bridge\n"); + fprintf(stderr, "Unknown family: ip, ip6, bridge, arp\n"); exit(EXIT_FAILURE); } diff --git a/examples/nft-chain-del.c b/examples/nft-chain-del.c index ddbab3f..95a1a7f 100644 --- a/examples/nft-chain-del.c +++ b/examples/nft-chain-del.c @@ -36,13 +36,15 @@ int main(int argc, char *argv[]) } if (strcmp(argv[1], "ip") == 0) - family = AF_INET; + family = NFPROTO_IPV4; else if (strcmp(argv[1], "ip6") == 0) - family = AF_INET6; + family = NFPROTO_IPV6; else if (strcmp(argv[1], "bridge") == 0) - family = AF_BRIDGE; + family = NFPROTO_BRIDGE; + else if (strcmp(argv[1], "arp") == 0) + family = NFPROTO_ARP; else { - fprintf(stderr, "Unknown family: ip, ip6, bridge\n"); + fprintf(stderr, "Unknown family: ip, ip6, bridge, arp\n"); exit(EXIT_FAILURE); } diff --git a/examples/nft-chain-get.c b/examples/nft-chain-get.c index 459b79e..e842c9a 100644 --- a/examples/nft-chain-get.c +++ b/examples/nft-chain-get.c @@ -14,6 +14,7 @@ #include #include +#include #include #include @@ -63,13 +64,15 @@ int main(int argc, char *argv[]) int family; if (strcmp(argv[1], "ip") == 0) - family = AF_INET; + family = NFPROTO_IPV4; else if (strcmp(argv[1], "ip6") == 0) - family = AF_INET6; + family = NFPROTO_IPV6; else if (strcmp(argv[1], "bridge") == 0) - family = AF_BRIDGE; + family = NFPROTO_BRIDGE; + else if (strcmp(argv[1], "arp") == 0) + family = NFPROTO_ARP; else { - fprintf(stderr, "Unknown family: ip, ip6, bridge\n"); + fprintf(stderr, "Unknown family: ip, ip6, bridge, arp\n"); exit(EXIT_FAILURE); } diff --git a/examples/nft-rule-add.c b/examples/nft-rule-add.c index ef546e2..f896bc0 100644 --- a/examples/nft-rule-add.c +++ b/examples/nft-rule-add.c @@ -16,6 +16,7 @@ #include #include +#include #include #include @@ -137,13 +138,15 @@ int main(int argc, char *argv[]) } if (strcmp(argv[1], "ip") == 0) - family = AF_INET; + family = NFPROTO_IPV4; else if (strcmp(argv[1], "ip6") == 0) - family = AF_INET6; + family = NFPROTO_IPV6; else if (strcmp(argv[1], "bridge") == 0) - family = AF_BRIDGE; + family = NFPROTO_BRIDGE; + else if (strcmp(argv[1], "arp") == 0) + family = NFPROTO_ARP; else { - fprintf(stderr, "Unknown family: ip, ip6, bridge\n"); + fprintf(stderr, "Unknown family: ip, ip6, bridge, arp\n"); exit(EXIT_FAILURE); } diff --git a/examples/nft-rule-del.c b/examples/nft-rule-del.c index 5ddfd50..c2b1a70 100644 --- a/examples/nft-rule-del.c +++ b/examples/nft-rule-del.c @@ -15,6 +15,7 @@ #include /* for offsetof */ #include +#include #include #include @@ -42,13 +43,15 @@ int main(int argc, char *argv[]) } if (strcmp(argv[1], "ip") == 0) - family = AF_INET; + family = NFPROTO_IPV4; else if (strcmp(argv[1], "ip6") == 0) - family = AF_INET6; + family = NFPROTO_IPV6; else if (strcmp(argv[1], "bridge") == 0) - family = AF_BRIDGE; + family = NFPROTO_BRIDGE; + else if (strcmp(argv[1], "arp") == 0) + family = NFPROTO_ARP; else { - fprintf(stderr, "Unknown family: ip, ip6, bridge\n"); + fprintf(stderr, "Unknown family: ip, ip6, bridge, arp\n"); exit(EXIT_FAILURE); } diff --git a/examples/nft-set-add.c b/examples/nft-set-add.c index afc37c5..0d17c38 100644 --- a/examples/nft-set-add.c +++ b/examples/nft-set-add.c @@ -14,6 +14,7 @@ #include #include +#include #include #include @@ -42,13 +43,15 @@ int main(int argc, char *argv[]) seq = time(NULL); if (strcmp(argv[1], "ip") == 0) - family = AF_INET; + family = NFPROTO_IPV4; else if (strcmp(argv[1], "ip6") == 0) - family = AF_INET6; + family = NFPROTO_IPV6; else if (strcmp(argv[1], "bridge") == 0) - family = AF_BRIDGE; + family = NFPROTO_BRIDGE; + else if (strcmp(argv[1], "arp") == 0) + family = NFPROTO_ARP; else { - fprintf(stderr, "Unknown family: ip, ip6, bridge\n"); + fprintf(stderr, "Unknown family: ip, ip6, bridge, arp\n"); exit(EXIT_FAILURE); } diff --git a/examples/nft-set-del.c b/examples/nft-set-del.c index aebc018..7828ae0 100644 --- a/examples/nft-set-del.c +++ b/examples/nft-set-del.c @@ -14,6 +14,7 @@ #include #include +#include #include #include @@ -41,13 +42,15 @@ int main(int argc, char *argv[]) seq = time(NULL); if (strcmp(argv[1], "ip") == 0) - family = AF_INET; + family = NFPROTO_IPV4; else if (strcmp(argv[1], "ip6") == 0) - family = AF_INET6; + family = NFPROTO_IPV6; else if (strcmp(argv[1], "bridge") == 0) - family = AF_BRIDGE; + family = NFPROTO_BRIDGE; + else if (strcmp(argv[1], "arp") == 0) + family = NFPROTO_ARP; else { - fprintf(stderr, "Unknown family: ip, ip6, bridge\n"); + fprintf(stderr, "Unknown family: ip, ip6, bridge, arp\n"); exit(EXIT_FAILURE); } diff --git a/examples/nft-set-elem-add.c b/examples/nft-set-elem-add.c index 992b09c..e2e278d 100644 --- a/examples/nft-set-elem-add.c +++ b/examples/nft-set-elem-add.c @@ -14,6 +14,7 @@ #include #include +#include #include #include @@ -42,13 +43,15 @@ int main(int argc, char *argv[]) seq = time(NULL); if (strcmp(argv[1], "ip") == 0) - family = AF_INET; + family = NFPROTO_IPV4; else if (strcmp(argv[1], "ip6") == 0) - family = AF_INET6; + family = NFPROTO_IPV6; else if (strcmp(argv[1], "bridge") == 0) - family = AF_BRIDGE; + family = NFPROTO_BRIDGE; + else if (strcmp(argv[1], "arp") == 0) + family = NFPROTO_ARP; else { - fprintf(stderr, "Unknown family: ip, ip6, bridge\n"); + fprintf(stderr, "Unknown family: ip, ip6, bridge, arp\n"); exit(EXIT_FAILURE); } diff --git a/examples/nft-set-elem-del.c b/examples/nft-set-elem-del.c index 5ec1183..36f1016 100644 --- a/examples/nft-set-elem-del.c +++ b/examples/nft-set-elem-del.c @@ -14,6 +14,7 @@ #include #include +#include #include #include @@ -42,13 +43,15 @@ int main(int argc, char *argv[]) seq = time(NULL); if (strcmp(argv[1], "ip") == 0) - family = AF_INET; + family = NFPROTO_IPV4; else if (strcmp(argv[1], "ip6") == 0) - family = AF_INET6; + family = NFPROTO_IPV6; else if (strcmp(argv[1], "bridge") == 0) - family = AF_BRIDGE; + family = NFPROTO_BRIDGE; + else if (strcmp(argv[1], "arp") == 0) + family = NFPROTO_ARP; else { - fprintf(stderr, "Unknown family: ip, ip6, bridge\n"); + fprintf(stderr, "Unknown family: ip, ip6, bridge, arp\n"); exit(EXIT_FAILURE); } diff --git a/examples/nft-set-elem-get.c b/examples/nft-set-elem-get.c index 591dd45..aeba400 100644 --- a/examples/nft-set-elem-get.c +++ b/examples/nft-set-elem-get.c @@ -14,6 +14,7 @@ #include #include +#include #include #include @@ -67,13 +68,15 @@ int main(int argc, char *argv[]) } seq = time(NULL); if (strcmp(argv[1], "ip") == 0) - family = AF_INET; + family = NFPROTO_IPV4; else if (strcmp(argv[1], "ip6") == 0) - family = AF_INET6; + family = NFPROTO_IPV6; else if (strcmp(argv[1], "bridge") == 0) - family = AF_BRIDGE; + family = NFPROTO_BRIDGE; + else if (strcmp(argv[1], "arp") == 0) + family = NFPROTO_ARP; else { - fprintf(stderr, "Unknown family: ip, ip6, bridge\n"); + fprintf(stderr, "Unknown family: ip, ip6, bridge, arp\n"); exit(EXIT_FAILURE); } diff --git a/examples/nft-set-get.c b/examples/nft-set-get.c index 45f74ff..7813cf0 100644 --- a/examples/nft-set-get.c +++ b/examples/nft-set-get.c @@ -14,6 +14,7 @@ #include #include +#include #include #include @@ -66,13 +67,15 @@ int main(int argc, char *argv[]) } seq = time(NULL); if (strcmp(argv[1], "ip") == 0) - family = AF_INET; + family = NFPROTO_IPV4; else if (strcmp(argv[1], "ip6") == 0) - family = AF_INET6; + family = NFPROTO_IPV6; else if (strcmp(argv[1], "bridge") == 0) - family = AF_BRIDGE; + family = NFPROTO_BRIDGE; + else if (strcmp(argv[1], "arp") == 0) + family = NFPROTO_ARP; else { - fprintf(stderr, "Unknown family: ip, ip6, bridge\n"); + fprintf(stderr, "Unknown family: ip, ip6, bridge, arp\n"); exit(EXIT_FAILURE); } diff --git a/examples/nft-table-add.c b/examples/nft-table-add.c index f59049c..e4d7db9 100644 --- a/examples/nft-table-add.c +++ b/examples/nft-table-add.c @@ -14,6 +14,7 @@ #include #include +#include #include #include @@ -41,13 +42,15 @@ int main(int argc, char *argv[]) seq = time(NULL); if (strcmp(argv[1], "ip") == 0) - family = AF_INET; + family = NFPROTO_IPV4; else if (strcmp(argv[1], "ip6") == 0) - family = AF_INET6; + family = NFPROTO_IPV6; else if (strcmp(argv[1], "bridge") == 0) - family = AF_BRIDGE; + family = NFPROTO_BRIDGE; + else if (strcmp(argv[1], "arp") == 0) + family = NFPROTO_ARP; else { - fprintf(stderr, "Unknown family: ip, ip6, bridge\n"); + fprintf(stderr, "Unknown family: ip, ip6, bridge, arp\n"); exit(EXIT_FAILURE); } diff --git a/examples/nft-table-del.c b/examples/nft-table-del.c index 2a73a27..11762fe 100644 --- a/examples/nft-table-del.c +++ b/examples/nft-table-del.c @@ -14,6 +14,7 @@ #include #include +#include #include #include @@ -41,13 +42,15 @@ int main(int argc, char *argv[]) seq = time(NULL); if (strcmp(argv[1], "ip") == 0) - family = AF_INET; + family = NFPROTO_IPV4; else if (strcmp(argv[1], "ip6") == 0) - family = AF_INET6; + family = NFPROTO_IPV6; else if (strcmp(argv[1], "bridge") == 0) - family = AF_BRIDGE; + family = NFPROTO_BRIDGE; + else if (strcmp(argv[1], "arp") == 0) + family = NFPROTO_ARP; else { - fprintf(stderr, "Unknown family: ip, ip6, bridge\n"); + fprintf(stderr, "Unknown family: ip, ip6, bridge, arp\n"); exit(EXIT_FAILURE); } diff --git a/examples/nft-table-get.c b/examples/nft-table-get.c index 96a7296..a618d80 100644 --- a/examples/nft-table-get.c +++ b/examples/nft-table-get.c @@ -14,6 +14,7 @@ #include #include +#include #include #include @@ -62,13 +63,15 @@ int main(int argc, char *argv[]) } if (strcmp(argv[1], "ip") == 0) - family = AF_INET; + family = NFPROTO_IPV4; else if (strcmp(argv[1], "ip6") == 0) - family = AF_INET6; + family = NFPROTO_IPV6; else if (strcmp(argv[1], "bridge") == 0) - family = AF_BRIDGE; + family = NFPROTO_BRIDGE; + else if (strcmp(argv[1], "arp") == 0) + family = NFPROTO_ARP; else { - fprintf(stderr, "Unknown family: ip, ip6, bridge\n"); + fprintf(stderr, "Unknown family: ip, ip6, bridge, arp\n"); exit(EXIT_FAILURE); } diff --git a/examples/nft-table-upd.c b/examples/nft-table-upd.c index 6b938bf..1cf41a4 100644 --- a/examples/nft-table-upd.c +++ b/examples/nft-table-upd.c @@ -14,6 +14,7 @@ #include #include +#include #include #include @@ -41,13 +42,15 @@ int main(int argc, char *argv[]) seq = time(NULL); if (strcmp(argv[1], "ip") == 0) - family = AF_INET; + family = NFPROTO_IPV4; else if (strcmp(argv[1], "ip6") == 0) - family = AF_INET6; + family = NFPROTO_IPV6; else if (strcmp(argv[1], "bridge") == 0) - family = AF_BRIDGE; + family = NFPROTO_BRIDGE; + else if (strcmp(argv[1], "arp") == 0) + family = NFPROTO_ARP; else { - fprintf(stderr, "Unknown family: ip, ip6, bridge\n"); + fprintf(stderr, "Unknown family: ip, ip6, bridge, arp\n"); exit(EXIT_FAILURE); } -- cgit v1.2.3