From 1c2d85856bfcc6766073ac7466ead76b225e8ccf Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 20 Dec 2009 02:30:32 +0000 Subject: [PATCH] contrib/fwd: add utility functions --- contrib/fwd/src/fwd_utils.c | 78 +++++++++++++++++++++++++++++++++++++ contrib/fwd/src/fwd_utils.h | 50 ++++++++++++++++++++++++ 2 files changed, 128 insertions(+) create mode 100644 contrib/fwd/src/fwd_utils.c create mode 100644 contrib/fwd/src/fwd_utils.h diff --git a/contrib/fwd/src/fwd_utils.c b/contrib/fwd/src/fwd_utils.c new file mode 100644 index 0000000000..170ecf4686 --- /dev/null +++ b/contrib/fwd/src/fwd_utils.c @@ -0,0 +1,78 @@ +/* + * fwd - OpenWrt firewall daemon - commmon utility functions + * + * Copyright (C) 2009 Jo-Philipp Wich + * + * The fwd program is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * The fwd program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with the fwd program. If not, see http://www.gnu.org/licenses/. + */ + + +#include "fwd_utils.h" + + +void fwd_log_init(void) +{ + openlog("Firewall", 0, LOG_DAEMON | LOG_PERROR); +} + +void __fwd_log(int prio, const char *msg, ...) +{ + va_list ap; + va_start(ap, msg); + vsyslog(prio, msg, ap); + va_end(ap); +} + + + +int fwd_empty_cidr(struct fwd_cidr *c) +{ + if( (c == NULL) || ((c->addr.s_addr == 0) && (c->prefix == 0)) ) + return 1; + + return 0; +} + +int fwd_equal_cidr(struct fwd_cidr *a, struct fwd_cidr *b) +{ + if( fwd_empty_cidr(a) && fwd_empty_cidr(b) ) + return 1; + else if( (a->addr.s_addr == b->addr.s_addr) && (a->prefix == b->prefix) ) + return 1; + + return 0; +} + +void fwd_update_cidr(struct fwd_cidr *a, struct fwd_cidr *b) +{ + if( a != NULL ) + { + a->addr.s_addr = b ? b->addr.s_addr : 0; + a->prefix = b ? b->prefix : 0; + } +} + + +/* fwd_zmalloc(size_t) + * Allocates a zeroed buffer of the given size. */ +void * fwd_zmalloc(size_t s) +{ + void *b = malloc(s); + + if( b != NULL ) + memset(b, 0, s); + + return b; +} + + diff --git a/contrib/fwd/src/fwd_utils.h b/contrib/fwd/src/fwd_utils.h new file mode 100644 index 0000000000..618a53784d --- /dev/null +++ b/contrib/fwd/src/fwd_utils.h @@ -0,0 +1,50 @@ +/* + * fwd - OpenWrt firewall daemon - commmon utility header + * + * Copyright (C) 2009 Jo-Philipp Wich + * + * The fwd program is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * The fwd program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with the fwd program. If not, see http://www.gnu.org/licenses/. + */ + +#ifndef __FWD_UTILS_H__ +#define __FWD_UTILS_H__ + +#include + +#include "fwd.h" + +void fwd_log_init(void); +void __fwd_log(int, const char *, ...); +#define fwd_log_info(...) __fwd_log(LOG_INFO, __VA_ARGS__) +#define fwd_log_err(...) __fwd_log(LOG_ERR, __VA_ARGS__) + +int fwd_empty_cidr(struct fwd_cidr *); +int fwd_equal_cidr(struct fwd_cidr *, struct fwd_cidr *); +void fwd_update_cidr(struct fwd_cidr *, struct fwd_cidr *); + +/* fwd_zmalloc(size_t) + * Allocates a zeroed buffer of the given size. */ +void * fwd_zmalloc(size_t); + +/* fwd_alloc_ptr(type) + * Allocates a buffer with the size of the given datatype + * and returns a pointer to it. */ +#define fwd_alloc_ptr(t) (t *) fwd_zmalloc(sizeof(t)) + +/* fwd_free_ptr(void *) + * Frees the given pointer and sets it to NULL. + * Safe for NULL values. */ +#define fwd_free_ptr(x) do { if(x != NULL) free(x); x = NULL; } while(0) + +#endif + -- 2.30.2