Use the queue.h linked list routines that are provided by glibc instead of carrying a Linux kernel derived implementation. fipvlan was the only tool using include/list.h, everything else uses sys/queue.h already.
Signed-off-by: Chris Leech <[email protected]> --- Makefile.am | 2 fipvlan.c | 33 ++-- include/list.h | 444 -------------------------------------------------------- 3 files changed, 19 insertions(+), 460 deletions(-) delete mode 100644 include/list.h diff --git a/Makefile.am b/Makefile.am index af34ee1..be4115a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,7 +41,7 @@ fcoemon_LDFLAGS = -lrt ## rules for building fipvlan ## only listed sources get packaged, so must list all headers too fipvlan_SOURCES = fipvlan.c fcoe_utils_version.h include/fip.h \ -log.c include/log.h include/list.h +log.c include/log.h ## install configuration file in $(prefix)/etc/fcoe fcoe_configdir = ${sysconfdir}/fcoe diff --git a/fipvlan.c b/fipvlan.c index cc8a785..7ba19d1 100644 --- a/fipvlan.c +++ b/fipvlan.c @@ -29,6 +29,7 @@ #include <signal.h> #include <sys/ioctl.h> #include <sys/socket.h> +#include <sys/queue.h> #include <net/if.h> #include <net/if_arp.h> #include <net/ethernet.h> @@ -39,7 +40,6 @@ #include "fcoe_utils_version.h" #include "fip.h" #include "log.h" -#include "list.h" #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) @@ -47,23 +47,27 @@ char *exe; +TAILQ_HEAD(iff_list_head, iff); + struct iff { int ifindex; char *ifname; unsigned char mac_addr[ETHER_ADDR_LEN]; - struct list_head list; + TAILQ_ENTRY(iff) list_node; }; -LIST_HEAD(interfaces); +struct iff_list_head interfaces = TAILQ_HEAD_INITIALIZER(interfaces); + +TAILQ_HEAD(fcf_list_head, fcf); struct fcf { struct iff *interface; uint16_t vlan; unsigned char mac_addr[ETHER_ADDR_LEN]; - struct list_head list; + TAILQ_ENTRY(fcf) list_node; }; -LIST_HEAD(fcfs); +struct fcf_list_head fcfs = TAILQ_HEAD_INITIALIZER(fcfs); /** * packet_socket - create a packet socket bound to the FIP ethertype @@ -223,7 +227,7 @@ int fip_recv_vlan_note(struct fiphdr *fh, ssize_t len, struct iff *iff) fcf->interface = iff; fcf->vlan = ntohs(tlvs.vlan[i]->vlan); memcpy(fcf->mac_addr, tlvs.mac->mac_addr, ETHER_ADDR_LEN); - list_add_tail(&fcf->list, &fcfs); + TAILQ_INSERT_TAIL(&fcfs, fcf, list_node); } return 0; @@ -271,12 +275,11 @@ int fip_recv(int s) ntohs(fh->fip_proto)); return -1; } - - list_for_each_entry(iff, &interfaces, list) { + TAILQ_FOREACH(iff, &interfaces, list_node) { if (iff->ifindex == sa.sll_ifindex) break; } - if (&iff->list == &interfaces) { + if (!iff) { log_warn("received packet on unexpected interface"); return -1; } @@ -420,7 +423,7 @@ void rtnl_recv_newlink(struct nlmsghdr *nh) } } - list_add_tail(&iff->list, &interfaces); + TAILQ_INSERT_TAIL(&interfaces, iff, list_node); } #define NLMSG(c) ((struct nlmsghdr *) (c)) @@ -617,7 +620,7 @@ int check_interface(char *name, int ps) } memcpy(iff->mac_addr, ifr.ifr_addr.sa_data, ETHER_ADDR_LEN); - list_add_tail(&iff->list, &interfaces); + TAILQ_INSERT_TAIL(&interfaces, iff, list_node); return 0; err: free(iff); @@ -628,7 +631,7 @@ void print_results() { struct fcf *fcf; - if (list_empty(&fcfs)) { + if (TAILQ_EMPTY(&fcfs)) { printf("No Fibre Channel Forwarders Found\n"); return; } @@ -636,7 +639,7 @@ void print_results() printf("Fibre Channel Forwarders Discovered\n"); printf("%-10.10s| %-5.5s| %-10.10s\n", "interface", "VLAN", "FCF MAC"); printf("------------------------------------\n"); - list_for_each_entry(fcf, &fcfs, list) { + TAILQ_FOREACH(fcf, &fcfs, list_node) { printf("%-10.10s| %-5d| %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n", fcf->interface->ifname, fcf->vlan, fcf->mac_addr[0], fcf->mac_addr[1], fcf->mac_addr[2], @@ -692,14 +695,14 @@ int main(int argc, char **argv) check_interface(namev[i], ps); } - if (list_empty(&interfaces)) { + if (TAILQ_EMPTY(&interfaces)) { log_err("no interfaces to perform discovery on"); close(ps); log_stop(); exit(1); } - list_for_each_entry(iff, &interfaces, list) + TAILQ_FOREACH(iff, &interfaces, list_node) fip_send_vlan_request(ps, iff); recv_loop(ps); diff --git a/include/list.h b/include/list.h deleted file mode 100644 index 35da9fd..0000000 --- a/include/list.h +++ /dev/null @@ -1,444 +0,0 @@ -/* Adapted from the Linux kernel, under the terms of the GPLv2 */ - -#ifndef LIST_H -#define LIST_H - -#include <stddef.h> - -#define container_of(ptr, type, member) ({ \ - const typeof(((type *) 0)->member) * __mptr = (ptr); \ - (type *)((char *) __mptr - offsetof(type, member)); \ -}) - -/* - * Simple doubly linked list implementation. - * - * Some of the internal functions ("__xxx") are useful when - * manipulating whole lists rather than single entries, as - * sometimes we already know the next/prev entries and we can - * generate better code by using them directly rather than - * using the generic single-entry routines. - */ - -struct list_head { - struct list_head *next, *prev; -}; - -#define LIST_HEAD_INIT(name) { &(name), &(name) } - -#define LIST_HEAD(name) \ - struct list_head name = LIST_HEAD_INIT(name) - -static inline void INIT_LIST_HEAD(struct list_head *list) -{ - list->next = list; - list->prev = list; -} - -/* - * Insert a new entry between two known consecutive entries. - * - * This is only for internal list manipulation where we know - * the prev/next entries already! - */ -static inline void __list_add(struct list_head *new, - struct list_head *prev, - struct list_head *next) -{ - next->prev = new; - new->next = next; - new->prev = prev; - prev->next = new; -} - -/** - * list_add - add a new entry - * @new: new entry to be added - * @head: list head to add it after - * - * Insert a new entry after the specified head. - * This is good for implementing stacks. - */ -static inline void list_add(struct list_head *new, struct list_head *head) -{ - __list_add(new, head, head->next); -} - -/** - * list_add_tail - add a new entry - * @new: new entry to be added - * @head: list head to add it before - * - * Insert a new entry before the specified head. - * This is useful for implementing queues. - */ -static inline void list_add_tail(struct list_head *new, struct list_head *head) -{ - __list_add(new, head->prev, head); -} - -/* - * Delete a list entry by making the prev/next entries - * point to each other. - * - * This is only for internal list manipulation where we know - * the prev/next entries already! - */ -static inline void __list_del(struct list_head *prev, struct list_head *next) -{ - next->prev = prev; - prev->next = next; -} - -/** - * list_del - deletes entry from list. - * @entry: the element to delete from the list. - * Note: list_empty() on entry does not return true after this, the entry is - * in an undefined state. - */ -static inline void list_del(struct list_head *entry) -{ - __list_del(entry->prev, entry->next); - entry->next = NULL; - entry->prev = NULL; -} - -/** - * list_replace - replace old entry by new one - * @old : the element to be replaced - * @new : the new element to insert - * - * If @old was empty, it will be overwritten. - */ -static inline void list_replace(struct list_head *old, - struct list_head *new) -{ - new->next = old->next; - new->next->prev = new; - new->prev = old->prev; - new->prev->next = new; -} - -static inline void list_replace_init(struct list_head *old, - struct list_head *new) -{ - list_replace(old, new); - INIT_LIST_HEAD(old); -} - -/** - * list_del_init - deletes entry from list and reinitialize it. - * @entry: the element to delete from the list. - */ -static inline void list_del_init(struct list_head *entry) -{ - __list_del(entry->prev, entry->next); - INIT_LIST_HEAD(entry); -} - -/** - * list_move - delete from one list and add as another's head - * @list: the entry to move - * @head: the head that will precede our entry - */ -static inline void list_move(struct list_head *list, struct list_head *head) -{ - __list_del(list->prev, list->next); - list_add(list, head); -} - -/** - * list_move_tail - delete from one list and add as another's tail - * @list: the entry to move - * @head: the head that will follow our entry - */ -static inline void list_move_tail(struct list_head *list, - struct list_head *head) -{ - __list_del(list->prev, list->next); - list_add_tail(list, head); -} - -/** - * list_is_last - tests whether @list is the last entry in list @head - * @list: the entry to test - * @head: the head of the list - */ -static inline int list_is_last(const struct list_head *list, - const struct list_head *head) -{ - return list->next == head; -} - -/** - * list_empty - tests whether a list is empty - * @head: the list to test. - */ -static inline int list_empty(const struct list_head *head) -{ - return head->next == head; -} - -/** - * list_empty_careful - tests whether a list is empty and not being modified - * @head: the list to test - * - * Description: - * tests whether a list is empty _and_ checks that no other CPU might be - * in the process of modifying either member (next or prev) - * - * NOTE: using list_empty_careful() without synchronization - * can only be safe if the only activity that can happen - * to the list entry is list_del_init(). Eg. it cannot be used - * if another CPU could re-list_add() it. - */ -static inline int list_empty_careful(const struct list_head *head) -{ - struct list_head *next = head->next; - return (next == head) && (next == head->prev); -} - -/** - * list_is_singular - tests whether a list has just one entry. - * @head: the list to test. - */ -static inline int list_is_singular(const struct list_head *head) -{ - return !list_empty(head) && (head->next == head->prev); -} - -static inline void __list_splice(const struct list_head *list, - struct list_head *head) -{ - struct list_head *first = list->next; - struct list_head *last = list->prev; - struct list_head *at = head->next; - - first->prev = head; - head->next = first; - - last->next = at; - at->prev = last; -} - -/** - * list_splice - join two lists - * @list: the new list to add. - * @head: the place to add it in the first list. - */ -static inline void list_splice(const struct list_head *list, - struct list_head *head) -{ - if (!list_empty(list)) - __list_splice(list, head); -} - -/** - * list_splice_init - join two lists and reinitialise the emptied list. - * @list: the new list to add. - * @head: the place to add it in the first list. - * - * The list at @list is reinitialised - */ -static inline void list_splice_init(struct list_head *list, - struct list_head *head) -{ - if (!list_empty(list)) { - __list_splice(list, head); - INIT_LIST_HEAD(list); - } -} - -/** - * list_entry - get the struct for this entry - * @ptr: the &struct list_head pointer. - * @type: the type of the struct this is embedded in. - * @member: the name of the list_struct within the struct. - */ -#define list_entry(ptr, type, member) \ - container_of(ptr, type, member) - -/** - * list_first_entry - get the first element from a list - * @ptr: the list head to take the element from. - * @type: the type of the struct this is embedded in. - * @member: the name of the list_struct within the struct. - * - * Note, that list is expected to be not empty. - */ -#define list_first_entry(ptr, type, member) \ - list_entry((ptr)->next, type, member) - -/** - * list_for_each - iterate over a list - * @pos: the &struct list_head to use as a loop cursor. - * @head: the head for your list. - */ -#define list_for_each(pos, head) \ - for (pos = (head)->next; pos != (head); pos = pos->next) - -/** - * list_for_each_prev - iterate over a list backwards - * @pos: the &struct list_head to use as a loop cursor. - * @head: the head for your list. - */ -#define list_for_each_prev(pos, head) \ - for (pos = (head)->prev; pos != (head); pos = pos->prev) - -/** - * list_for_each_safe - iterate over a list safe against removal of list entry - * @pos: the &struct list_head to use as a loop cursor. - * @n: another &struct list_head to use as temporary storage - * @head: the head for your list. - */ -#define list_for_each_safe(pos, n, head) \ - for (pos = (head)->next, n = pos->next; \ - pos != (head); \ - pos = n, n = pos->next) - -/** - * list_for_each_prev_safe - iterate over a list backwards safe against removal of list entry - * @pos: the &struct list_head to use as a loop cursor. - * @n: another &struct list_head to use as temporary storage - * @head: the head for your list. - */ -#define list_for_each_prev_safe(pos, n, head) \ - for (pos = (head)->prev, n = pos->prev; \ - pos != (head); \ - pos = n, n = pos->prev) - -/** - * list_for_each_entry - iterate over list of given type - * @pos: the type * to use as a loop cursor. - * @head: the head for your list. - * @member: the name of the list_struct within the struct. - */ -#define list_for_each_entry(pos, head, member) \ - for (pos = list_entry((head)->next, typeof(*pos), member); \ - &pos->member != (head); \ - pos = list_entry(pos->member.next, typeof(*pos), member)) - -/** - * list_for_each_entry_reverse - iterate backwards over list of given type. - * @pos: the type * to use as a loop cursor. - * @head: the head for your list. - * @member: the name of the list_struct within the struct. - */ -#define list_for_each_entry_reverse(pos, head, member) \ - for (pos = list_entry((head)->prev, typeof(*pos), member); \ - &pos->member != (head); \ - pos = list_entry(pos->member.prev, typeof(*pos), member)) - -/** - * list_prepare_entry - prepare a pos entry for use in list_for_each_entry_continue() - * @pos: the type * to use as a start point - * @head: the head of the list - * @member: the name of the list_struct within the struct. - * - * Prepares a pos entry for use as a start point in - * list_for_each_entry_continue(). - */ -#define list_prepare_entry(pos, head, member) \ - ((pos) ? : list_entry(head, typeof(*pos), member)) - -/** - * list_for_each_entry_continue - continue iteration over list of given type - * @pos: the type * to use as a loop cursor. - * @head: the head for your list. - * @member: the name of the list_struct within the struct. - * - * Continue to iterate over list of given type, continuing after - * the current position. - */ -#define list_for_each_entry_continue(pos, head, member) \ - for (pos = list_entry(pos->member.next, typeof(*pos), member); \ - &pos->member != (head); \ - pos = list_entry(pos->member.next, typeof(*pos), member)) - -/** - * list_for_each_entry_continue_reverse - iterate backwards from the given point - * @pos: the type * to use as a loop cursor. - * @head: the head for your list. - * @member: the name of the list_struct within the struct. - * - * Start to iterate over list of given type backwards, continuing after - * the current position. - */ -#define list_for_each_entry_continue_reverse(pos, head, member) \ - for (pos = list_entry(pos->member.prev, typeof(*pos), member); \ - &pos->member != (head); \ - pos = list_entry(pos->member.prev, typeof(*pos), member)) - -/** - * list_for_each_entry_from - iterate over list of given type from the current point - * @pos: the type * to use as a loop cursor. - * @head: the head for your list. - * @member: the name of the list_struct within the struct. - * - * Iterate over list of given type, continuing from current position. - */ -#define list_for_each_entry_from(pos, head, member) \ - for (; &pos->member != (head); \ - pos = list_entry(pos->member.next, typeof(*pos), member)) - -/** - * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry - * @pos: the type * to use as a loop cursor. - * @n: another type * to use as temporary storage - * @head: the head for your list. - * @member: the name of the list_struct within the struct. - */ -#define list_for_each_entry_safe(pos, n, head, member) \ - for (pos = list_entry((head)->next, typeof(*pos), member), \ - n = list_entry(pos->member.next, typeof(*pos), member); \ - &pos->member != (head); \ - pos = n, n = list_entry(n->member.next, typeof(*n), member)) - -/** - * list_for_each_entry_safe_continue - * @pos: the type * to use as a loop cursor. - * @n: another type * to use as temporary storage - * @head: the head for your list. - * @member: the name of the list_struct within the struct. - * - * Iterate over list of given type, continuing after current point, - * safe against removal of list entry. - */ -#define list_for_each_entry_safe_continue(pos, n, head, member) \ - for (pos = list_entry(pos->member.next, typeof(*pos), member), \ - n = list_entry(pos->member.next, typeof(*pos), member); \ - &pos->member != (head); \ - pos = n, n = list_entry(n->member.next, typeof(*n), member)) - -/** - * list_for_each_entry_safe_from - * @pos: the type * to use as a loop cursor. - * @n: another type * to use as temporary storage - * @head: the head for your list. - * @member: the name of the list_struct within the struct. - * - * Iterate over list of given type from current point, safe against - * removal of list entry. - */ -#define list_for_each_entry_safe_from(pos, n, head, member) \ - for (n = list_entry(pos->member.next, typeof(*pos), member); \ - &pos->member != (head); \ - pos = n, n = list_entry(n->member.next, typeof(*n), member)) - -/** - * list_for_each_entry_safe_reverse - * @pos: the type * to use as a loop cursor. - * @n: another type * to use as temporary storage - * @head: the head for your list. - * @member: the name of the list_struct within the struct. - * - * Iterate backwards over list of given type, safe against removal - * of list entry. - */ -#define list_for_each_entry_safe_reverse(pos, n, head, member) \ - for (pos = list_entry((head)->prev, typeof(*pos), member), \ - n = list_entry(pos->member.prev, typeof(*pos), member); \ - &pos->member != (head); \ - pos = n, n = list_entry(n->member.prev, typeof(*n), member)) - -#endif /* LIST_H */ _______________________________________________ devel mailing list [email protected] http://www.open-fcoe.org/mailman/listinfo/devel
