Browse Source

split and renamed xtables libs so that they actually load

pull/1/head
Niels Werensteijn 8 years ago
parent
commit
d158318625
  1. 127
      src/libxt_ts3init_get_cookie.c
  2. 102
      src/libxt_ts3init_get_puzzle.c

127
src/libxt_ts3init_get_cookie.c

@ -0,0 +1,127 @@ @@ -0,0 +1,127 @@
/*
* "ts3init_get_cookie and ts3init_get_puzzle" match extension for iptables
* Niels Werensteijn <niels werensteijn [at] teamspeak com>, 2016-10-03
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License; either version 2
* or 3 of the License, as published by the Free Software Foundation.
*/
#include <stdbool.h>
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <getopt.h>
#include <xtables.h>
#include "ts3init_match.h"
#define param_act(t, s, f) xtables_param_act((t), "ts3init_get_cookie", (s), (f))
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
static void ts3init_get_cookie_help(void)
{
printf(
"ts3init_get_cookie match options:\n"
" --min-client n The sending client needs to be at least version n.\n"
" --check-time sec Check packet send time request. May be off by sec seconds.\n"
);
}
static const struct option ts3init_get_cookie_opts[] = {
{.name = "min-client", .has_arg = true, .val = '1'},
{.name = "check-time", .has_arg = true, .val = '2'},
{NULL},
};
static int ts3init_get_cookie_parse(int c, char **argv, int invert, unsigned int *flags,
const void *entry, struct xt_entry_match **match)
{
struct xt_ts3init_get_cookie_mtinfo *info = (void *)(*match)->data;
int client_version;
int time_offset;
switch (c) {
case '1':
param_act(XTF_ONLY_ONCE, "--min-client", info->common_options & CHK_COMMON_CLIENT_VERSION);
param_act(XTF_NO_INVERT, "--min-client", invert);
client_version = atoi(optarg);
if (client_version <= 0)
xtables_error(PARAMETER_PROBLEM,
"ts3init_get_cookie: invalid min-client version");
info->common_options |= CHK_COMMON_CLIENT_VERSION;
info->min_client_version = client_version;
return true;
case '2':
param_act(XTF_ONLY_ONCE, "--check-time", info->specific_options & CHK_GET_COOKIE_CHECK_TIMESTAMP);
param_act(XTF_NO_INVERT, "--check-time", invert);
time_offset = atoi(optarg);
if (time_offset <= 0)
xtables_error(PARAMETER_PROBLEM,
"ts3init_get_cookie: invalid time offset");
info->specific_options |= CHK_GET_COOKIE_CHECK_TIMESTAMP;
info->max_utc_offset = time_offset;
return true;
default:
return false;
}
}
static void ts3init_get_cookie_save(const void *ip, const struct xt_entry_match *match)
{
const struct xt_ts3init_get_cookie_mtinfo *info = (const void *)match->data;
if (info->common_options & CHK_COMMON_CLIENT_VERSION)
{
printf("--min-client %u ", info->min_client_version);
}
if (info->specific_options & CHK_GET_COOKIE_CHECK_TIMESTAMP)
{
printf("--check-time %u ", info->max_utc_offset);
}
}
static void ts3init_get_cookie_print(const void *ip, const struct xt_entry_match *match,
int numeric)
{
printf(" -m ts3init_get_cookie ");
ts3init_get_cookie_save(ip, match);
}
/* register and init */
static struct xtables_match ts3init_mt_reg[] =
{
{
.name = "ts3init_get_cookie",
.revision = 0,
.family = NFPROTO_IPV4,
.version = XTABLES_VERSION,
.size = XT_ALIGN(sizeof(struct xt_ts3init_get_cookie_mtinfo)),
.userspacesize = XT_ALIGN(sizeof(struct xt_ts3init_get_cookie_mtinfo)),
.help = ts3init_get_cookie_help,
.parse = ts3init_get_cookie_parse,
.print = ts3init_get_cookie_print,
.save = ts3init_get_cookie_save,
.extra_opts = ts3init_get_cookie_opts,
},
{
.name = "ts3init_get_cookie",
.revision = 0,
.family = NFPROTO_IPV6,
.version = XTABLES_VERSION,
.size = XT_ALIGN(sizeof(struct xt_ts3init_get_cookie_mtinfo)),
.userspacesize = XT_ALIGN(sizeof(struct xt_ts3init_get_cookie_mtinfo)),
.help = ts3init_get_cookie_help,
.parse = ts3init_get_cookie_parse,
.print = ts3init_get_cookie_print,
.save = ts3init_get_cookie_save,
.extra_opts = ts3init_get_cookie_opts,
},
};
static __attribute__((constructor)) void ts3init_mt_ldr(void)
{
xtables_register_matches(ts3init_mt_reg, ARRAY_SIZE(ts3init_mt_reg));
}

102
src/libxt_ts3init.c → src/libxt_ts3init_get_puzzle.c

@ -16,82 +16,8 @@ @@ -16,82 +16,8 @@
#include <xtables.h>
#include "ts3init_match.h"
#define param_act(t, s, f) xtables_param_act((t), "ts3init_get_cookie", (s), (f))
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
static void ts3init_get_cookie_help(void)
{
printf(
"ts3init_get_cookie match options:\n"
" --min-client n The sending client needs to be at least version n.\n"
" --check-time sec Check packet send time request. May be off by sec seconds.\n"
);
}
static const struct option ts3init_get_cookie_opts[] = {
{.name = "min-client", .has_arg = true, .val = '1'},
{.name = "check-time", .has_arg = true, .val = '2'},
{NULL},
};
static int ts3init_get_cookie_parse(int c, char **argv, int invert, unsigned int *flags,
const void *entry, struct xt_entry_match **match)
{
struct xt_ts3init_get_cookie_mtinfo *info = (void *)(*match)->data;
int client_version;
int time_offset;
switch (c) {
case '1':
param_act(XTF_ONLY_ONCE, "--min-client", info->common_options & CHK_COMMON_CLIENT_VERSION);
param_act(XTF_NO_INVERT, "--min-client", invert);
client_version = atoi(optarg);
if (client_version <= 0)
xtables_error(PARAMETER_PROBLEM,
"ts3init_get_cookie: invalid min-client version");
info->common_options |= CHK_COMMON_CLIENT_VERSION;
info->min_client_version = client_version;
return true;
case '2':
param_act(XTF_ONLY_ONCE, "--check-time", info->specific_options & CHK_GET_COOKIE_CHECK_TIMESTAMP);
param_act(XTF_NO_INVERT, "--check-time", invert);
time_offset = atoi(optarg);
if (time_offset <= 0)
xtables_error(PARAMETER_PROBLEM,
"ts3init_get_cookie: invalid time offset");
info->specific_options |= CHK_GET_COOKIE_CHECK_TIMESTAMP;
info->max_utc_offset = time_offset;
return true;
default:
return false;
}
}
static void ts3init_get_cookie_save(const void *ip, const struct xt_entry_match *match)
{
const struct xt_ts3init_get_cookie_mtinfo *info = (const void *)match->data;
if (info->common_options & CHK_COMMON_CLIENT_VERSION)
{
printf("--min-client %u ", info->min_client_version);
}
if (info->specific_options & CHK_GET_COOKIE_CHECK_TIMESTAMP)
{
printf("--check-time %u ", info->max_utc_offset);
}
}
static void ts3init_get_cookie_print(const void *ip, const struct xt_entry_match *match,
int numeric)
{
printf(" -m ts3init_get_cookie ");
ts3init_get_cookie_save(ip, match);
}
#undef param_act
#define param_act(t, s, f) xtables_param_act((t), "ts3init_get_puzzle", (s), (f))
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
static bool hex2int_seed(const char *src, __u8* dst)
{
@ -192,32 +118,6 @@ static void ts3init_get_puzzle_print(const void *ip, const struct xt_entry_match @@ -192,32 +118,6 @@ static void ts3init_get_puzzle_print(const void *ip, const struct xt_entry_match
/* register and init */
static struct xtables_match ts3init_mt_reg[] =
{
{
.name = "ts3init_get_cookie",
.revision = 0,
.family = NFPROTO_IPV4,
.version = XTABLES_VERSION,
.size = XT_ALIGN(sizeof(struct xt_ts3init_get_cookie_mtinfo)),
.userspacesize = XT_ALIGN(sizeof(struct xt_ts3init_get_cookie_mtinfo)),
.help = ts3init_get_cookie_help,
.parse = ts3init_get_cookie_parse,
.print = ts3init_get_cookie_print,
.save = ts3init_get_cookie_save,
.extra_opts = ts3init_get_cookie_opts,
},
{
.name = "ts3init_get_cookie",
.revision = 0,
.family = NFPROTO_IPV6,
.version = XTABLES_VERSION,
.size = XT_ALIGN(sizeof(struct xt_ts3init_get_cookie_mtinfo)),
.userspacesize = XT_ALIGN(sizeof(struct xt_ts3init_get_cookie_mtinfo)),
.help = ts3init_get_cookie_help,
.parse = ts3init_get_cookie_parse,
.print = ts3init_get_cookie_print,
.save = ts3init_get_cookie_save,
.extra_opts = ts3init_get_cookie_opts,
},
{
.name = "ts3init_get_puzzle",
.revision = 0,
Loading…
Cancel
Save