]> granicus.if.org Git - ipset/commitdiff
Second stage to ipset-5
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Thu, 22 Apr 2010 14:48:33 +0000 (16:48 +0200)
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Thu, 22 Apr 2010 14:48:33 +0000 (16:48 +0200)
Rename files in src/ according to the new naming convention.

src/ipset.h [deleted file]
src/ipset_bitmap_ip.c [moved from src/ipset_ipmap.c with 100% similarity]
src/ipset_bitmap_ipmac.c [moved from src/ipset_macipmap.c with 100% similarity]
src/ipset_bitmap_port.c [moved from src/ipset_portmap.c with 100% similarity]
src/ipset_hash_ip.c [moved from src/ipset_iphash.c with 100% similarity]
src/ipset_hash_ipport.c [moved from src/ipset_ipporthash.c with 100% similarity]
src/ipset_hash_ipportip.c [moved from src/ipset_ipportiphash.c with 100% similarity]
src/ipset_hash_ipportnet.c [moved from src/ipset_ipportnethash.c with 100% similarity]
src/ipset_hash_net.c [moved from src/ipset_nethash.c with 100% similarity]
src/ipset_list_set.c [moved from src/ipset_setlist.c with 100% similarity]
src/ipset_tree_ip.c [moved from src/ipset_iptree.c with 100% similarity]

diff --git a/src/ipset.h b/src/ipset.h
deleted file mode 100644 (file)
index c49418d..0000000
+++ /dev/null
@@ -1,200 +0,0 @@
-#ifndef __IPSET_H
-#define __IPSET_H
-
-/* Copyright 2000-2004 Joakim Axelsson (gozem@linux.nu)
- *                     Patrick Schaaf (bof@bof.de)
- *                     Jozsef Kadlecsik (kadlec@blackhole.kfki.hu)
- *
- * This program is free software; you can redistribute it and/or modify   
- * it under the terms of the GNU General Public License as published by   
- * the Free Software Foundation; either version 2 of the License, or      
- * (at your option) any later version.                                    
- *                                                                         
- * This 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 this program; if not, write to the Free Software            
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#include <getopt.h>                    /* struct option */
-#include <stdint.h>
-#include <sys/types.h>
-
-#include <linux/netfilter_ipv4/ip_set.h>
-
-#define IPSET_LIB_NAME "/libipset_%s.so"
-#define PROC_SYS_MODPROBE "/proc/sys/kernel/modprobe"
-
-#define LIST_TRIES 5
-
-#ifdef IPSET_DEBUG
-extern int option_debug;
-#define DP(format, args...) if (option_debug)                  \
-       do {                                                    \
-               fprintf(stderr, "%s: %s (DBG): ", __FILE__, __FUNCTION__);\
-               fprintf(stderr, format "\n" , ## args);                 \
-       } while (0)
-#else
-#define DP(format, args...)
-#endif
-
-/* Commands */
-enum set_commands {
-       CMD_NONE,
-       CMD_CREATE,             /* -N */
-       CMD_DESTROY,            /* -X */
-       CMD_FLUSH,              /* -F */
-       CMD_RENAME,             /* -E */
-       CMD_SWAP,               /* -W */
-       CMD_LIST,               /* -L */
-       CMD_SAVE,               /* -S */
-       CMD_RESTORE,            /* -R */
-       CMD_ADD,                /* -A */
-       CMD_DEL,                /* -D */
-       CMD_TEST,               /* -T */
-       CMD_HELP,               /* -H */
-       CMD_VERSION,            /* -V */
-       NUMBER_OF_CMD = CMD_VERSION,
-       /* Internal commands */
-       CMD_MAX_SETS,
-       CMD_LIST_SIZE,
-       CMD_SAVE_SIZE,
-       CMD_ADT_GET,
-};
-
-enum exittype {
-       OTHER_PROBLEM = 1,
-       PARAMETER_PROBLEM,
-       VERSION_PROBLEM
-};
-
-/* The view of an ipset in userspace */
-struct set {
-       char name[IP_SET_MAXNAMELEN];           /* Name of the set */
-       ip_set_id_t id;                         /* Unique set id */
-       ip_set_id_t index;                      /* Array index */
-       unsigned ref;                           /* References in kernel */
-       struct settype *settype;                /* Pointer to set type functions */
-};
-
-struct settype {
-       struct settype *next;
-
-       char typename[IP_SET_MAXNAMELEN];
-
-       int protocol_version;
-
-       /*
-        * Create set
-        */
-
-       /* Size of create data. Will be sent to kernel */
-       u_int32_t create_size;
-
-       /* Initialize the create. */
-       void (*create_init) (void *data);
-
-       /* Function which parses command options; returns true if it ate an option */
-       int (*create_parse) (int c, char *argv[], void *data,
-                            unsigned *flags);
-
-       /* Final check; exit if not ok. */
-       void (*create_final) (void *data, unsigned int flags);
-
-       /* Pointer to list of extra command-line options for create */
-       const struct option *create_opts;
-
-       /*
-        * Add/del/test IP
-        */
-
-       /* Size of data. Will be sent to kernel */
-       u_int32_t adt_size;
-
-       /* Function which parses command options */
-       ip_set_ip_t (*adt_parser) (int cmd, const char *optarg, void *data);
-
-       /*
-        * Printing
-        */
-
-       /* Size of header. */
-       u_int32_t header_size;
-
-       /* Initialize the type-header */
-       void (*initheader) (struct set *set, const void *data);
-
-       /* Pretty print the type-header */
-       void (*printheader) (struct set *set, unsigned options);
-
-       /* Pretty print all IPs */
-       void (*printips) (struct set *set, void *data, u_int32_t len,
-                         unsigned options, char dont_align);
-
-       /* Pretty print all IPs sorted */
-       void (*printips_sorted) (struct set *set, void *data, u_int32_t len,
-                                unsigned options, char dont_align);
-
-       /* Print save arguments for creating the set */
-       void (*saveheader) (struct set *set, unsigned options);
-
-       /* Print save for all IPs */
-       void (*saveips) (struct set *set, void *data, u_int32_t len,
-                        unsigned options, char dont_align);
-
-       /* Print usage */
-       void (*usage) (void);
-
-       /* Internal data */
-       void *header;
-       void *data;
-       int option_offset;
-       unsigned int flags;
-};
-
-extern void settype_register(struct settype *settype);
-
-/* extern void unregister_settype(set_type_t *set_type); */
-
-extern void exit_error(int status, const char *msg, ...);
-
-extern char *binding_ip_tostring(struct set *set,
-                                ip_set_ip_t ip, unsigned options);
-extern char *ip_tostring(ip_set_ip_t ip, unsigned options);
-extern char *ip_tostring_numeric(ip_set_ip_t ip);
-extern void parse_ip(const char *str, ip_set_ip_t * ip);
-extern void parse_mask(const char *str, ip_set_ip_t * mask);
-extern void parse_ipandmask(const char *str, ip_set_ip_t * ip,
-                           ip_set_ip_t * mask);
-extern char *port_tostring(ip_set_ip_t port, unsigned options);
-extern void parse_port(const char *str, ip_set_ip_t * port);
-extern int string_to_number(const char *str, unsigned int min, unsigned int max,
-                           ip_set_ip_t *port);
-
-extern void *ipset_malloc(size_t size);
-extern char *ipset_strdup(const char *);
-extern void ipset_free(void *data);
-
-extern struct set *set_find_byname(const char *name);
-extern struct set *set_find_byid(ip_set_id_t id);
-
-extern unsigned warn_once;
-
-#define BITS_PER_LONG  (8*sizeof(ip_set_ip_t))
-#define BIT_WORD(nr)   ((nr) / BITS_PER_LONG)
-
-static inline int test_bit(int nr, const ip_set_ip_t *addr)
-{
-       return 1 & (addr[BIT_WORD(nr)] >> (nr & (BITS_PER_LONG-1)));
-}
-
-#define UNUSED __attribute__ ((unused))
-#define CONSTRUCTOR(module) \
-void __attribute__ ((constructor)) module##_init(void); \
-void module##_init(void)
-
-#endif /* __IPSET_H */
similarity index 100%
rename from src/ipset_ipmap.c
rename to src/ipset_bitmap_ip.c
similarity index 100%
rename from src/ipset_portmap.c
rename to src/ipset_bitmap_port.c
similarity index 100%
rename from src/ipset_iphash.c
rename to src/ipset_hash_ip.c
similarity index 100%
rename from src/ipset_nethash.c
rename to src/ipset_hash_net.c
similarity index 100%
rename from src/ipset_setlist.c
rename to src/ipset_list_set.c
similarity index 100%
rename from src/ipset_iptree.c
rename to src/ipset_tree_ip.c