diff options
author | piso <piso@FreeBSD.org> | 2009-04-08 11:56:49 +0000 |
---|---|---|
committer | piso <piso@FreeBSD.org> | 2009-04-08 11:56:49 +0000 |
commit | 5551ee2e3d1c8bf42ad84be6cd576d32c108ced4 (patch) | |
tree | c31101909fbad146ea2f40aa38b2d6a067973466 | |
parent | d271d75d6e163a5db92e5a0bbd34157d11c5fb50 (diff) | |
download | FreeBSD-src-5551ee2e3d1c8bf42ad84be6cd576d32c108ced4.zip FreeBSD-src-5551ee2e3d1c8bf42ad84be6cd576d32c108ced4.tar.gz |
-don't pass down, to module's fingerprint function, unused data like
a pointer to the ip header.
-style
-spacing
-rw-r--r-- | sys/netinet/libalias/alias_cuseeme.c | 2 | ||||
-rw-r--r-- | sys/netinet/libalias/alias_dummy.c | 2 | ||||
-rw-r--r-- | sys/netinet/libalias/alias_ftp.c | 2 | ||||
-rw-r--r-- | sys/netinet/libalias/alias_irc.c | 2 | ||||
-rw-r--r-- | sys/netinet/libalias/alias_mod.c | 34 | ||||
-rw-r--r-- | sys/netinet/libalias/alias_mod.h | 8 | ||||
-rw-r--r-- | sys/netinet/libalias/alias_nbt.c | 4 | ||||
-rw-r--r-- | sys/netinet/libalias/alias_pptp.c | 4 | ||||
-rw-r--r-- | sys/netinet/libalias/alias_skinny.c | 2 | ||||
-rw-r--r-- | sys/netinet/libalias/alias_smedia.c | 2 |
10 files changed, 34 insertions, 28 deletions
diff --git a/sys/netinet/libalias/alias_cuseeme.c b/sys/netinet/libalias/alias_cuseeme.c index f255942..28f5e93 100644 --- a/sys/netinet/libalias/alias_cuseeme.c +++ b/sys/netinet/libalias/alias_cuseeme.c @@ -64,7 +64,7 @@ AliasHandleCUSeeMeIn(struct libalias *la, struct ip *pip, struct in_addr original_addr); static int -fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) +fingerprint(struct libalias *la, struct alias_data *ah) { if (ah->dport == NULL || ah->oaddr == NULL) diff --git a/sys/netinet/libalias/alias_dummy.c b/sys/netinet/libalias/alias_dummy.c index fc6a0f9..4283aaf 100644 --- a/sys/netinet/libalias/alias_dummy.c +++ b/sys/netinet/libalias/alias_dummy.c @@ -60,7 +60,7 @@ static void AliasHandleDummy(struct libalias *la, struct ip *ip, struct alias_data *ah); static int -fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) +fingerprint(struct libalias *la, struct alias_data *ah) { /* diff --git a/sys/netinet/libalias/alias_ftp.c b/sys/netinet/libalias/alias_ftp.c index 50fa8d0..ef0e52c 100644 --- a/sys/netinet/libalias/alias_ftp.c +++ b/sys/netinet/libalias/alias_ftp.c @@ -104,7 +104,7 @@ AliasHandleFtpOut(struct libalias *, struct ip *, struct alias_link *, int maxpacketsize); static int -fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) +fingerprint(struct libalias *la, struct alias_data *ah) { if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL || diff --git a/sys/netinet/libalias/alias_irc.c b/sys/netinet/libalias/alias_irc.c index 8197fb8..c01e8e6 100644 --- a/sys/netinet/libalias/alias_irc.c +++ b/sys/netinet/libalias/alias_irc.c @@ -93,7 +93,7 @@ AliasHandleIrcOut(struct libalias *, struct ip *, struct alias_link *, int maxpacketsize); static int -fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) +fingerprint(struct libalias *la, struct alias_data *ah) { if (ah->dport == NULL || ah->dport == NULL || ah->lnk == NULL || diff --git a/sys/netinet/libalias/alias_mod.c b/sys/netinet/libalias/alias_mod.c index 643fe5f..2713137 100644 --- a/sys/netinet/libalias/alias_mod.c +++ b/sys/netinet/libalias/alias_mod.c @@ -133,9 +133,10 @@ handler_chain_destroy(void) static int _attach_handler(struct proto_handler *p) { - struct proto_handler *b = NULL; + struct proto_handler *b; - LIBALIAS_WLOCK_ASSERT(); + LIBALIAS_WLOCK_ASSERT(); + b = NULL; LIST_FOREACH(b, &handler_chain, entries) { if ((b->pri == p->pri) && (b->dir == p->dir) && @@ -172,10 +173,11 @@ _detach_handler(struct proto_handler *p) int LibAliasAttachHandlers(struct proto_handler *_p) { - int i, error = -1; + int i, error; LIBALIAS_WLOCK(); - for (i=0; 1; i++) { + error = -1; + for (i = 0; 1; i++) { if (*((int *)&_p[i]) == EOH) break; error = _attach_handler(&_p[i]); @@ -189,10 +191,11 @@ LibAliasAttachHandlers(struct proto_handler *_p) int LibAliasDetachHandlers(struct proto_handler *_p) { - int i, error = -1; + int i, error; LIBALIAS_WLOCK(); - for (i=0; 1; i++) { + error = -1; + for (i = 0; 1; i++) { if (*((int *)&_p[i]) == EOH) break; error = _detach_handler(&_p[i]); @@ -206,26 +209,27 @@ LibAliasDetachHandlers(struct proto_handler *_p) int detach_handler(struct proto_handler *_p) { - int error = -1; + int error; LIBALIAS_WLOCK(); + error = -1; error = _detach_handler(_p); LIBALIAS_WUNLOCK(); return (error); } int -find_handler(int8_t dir, int8_t proto, struct libalias *la, struct ip *pip, - struct alias_data *ad) +find_handler(int8_t dir, int8_t proto, struct libalias *la, __unused struct ip *pip, + struct alias_data *ad) { struct proto_handler *p; - int error = ENOENT; + int error; LIBALIAS_RLOCK(); - + error = ENOENT; LIST_FOREACH(p, &handler_chain, entries) { if ((p->dir & dir) && (p->proto & proto)) - if (p->fingerprint(la, pip, ad) == 0) { + if (p->fingerprint(la, ad) == 0) { error = p->protohandler(la, pip, ad); break; } @@ -259,9 +263,11 @@ attach_dll(struct dll *p) void * detach_dll(char *p) { - struct dll *b = NULL, *b_tmp; - void *error = NULL; + struct dll *b, *b_tmp; + void *error; + b = NULL; + error = NULL; SLIST_FOREACH_SAFE(b, &dll_chain, next, b_tmp) if (!strncmp(b->name, p, DLL_LEN)) { SLIST_REMOVE(&dll_chain, b, dll, next); diff --git a/sys/netinet/libalias/alias_mod.h b/sys/netinet/libalias/alias_mod.h index 5e193e9..f2f679d 100644 --- a/sys/netinet/libalias/alias_mod.h +++ b/sys/netinet/libalias/alias_mod.h @@ -80,10 +80,10 @@ struct proto_handler { u_int pri; /* Handler priority. */ int16_t dir; /* Flow direction. */ uint8_t proto; /* Working protocol. */ - int (*fingerprint)(struct libalias *la, /* Fingerprint * function. */ - struct ip *pip, struct alias_data *ah); - int (*protohandler)(struct libalias *la, /* Aliasing * function. */ - struct ip *pip, struct alias_data *ah); + int (*fingerprint)(struct libalias *, /* Fingerprint * function. */ + struct alias_data *); + int (*protohandler)(struct libalias *, /* Aliasing * function. */ + struct ip *, struct alias_data *); LIST_ENTRY(proto_handler) entries; }; diff --git a/sys/netinet/libalias/alias_nbt.c b/sys/netinet/libalias/alias_nbt.c index 924ee6a..2990c6b 100644 --- a/sys/netinet/libalias/alias_nbt.c +++ b/sys/netinet/libalias/alias_nbt.c @@ -77,7 +77,7 @@ static int AliasHandleUdpNbtNS(struct libalias *, struct ip *, struct alias_link *, struct in_addr *, u_short *, struct in_addr *, u_short *); static int -fingerprint1(struct libalias *la, struct ip *pip, struct alias_data *ah) +fingerprint1(struct libalias *la, struct alias_data *ah) { if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL || @@ -98,7 +98,7 @@ protohandler1(struct libalias *la, struct ip *pip, struct alias_data *ah) } static int -fingerprint2(struct libalias *la, struct ip *pip, struct alias_data *ah) +fingerprint2(struct libalias *la, struct alias_data *ah) { if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL || diff --git a/sys/netinet/libalias/alias_pptp.c b/sys/netinet/libalias/alias_pptp.c index b4fd9d0..3465c78 100644 --- a/sys/netinet/libalias/alias_pptp.c +++ b/sys/netinet/libalias/alias_pptp.c @@ -79,7 +79,7 @@ static int AliasHandlePptpGreIn(struct libalias *, struct ip *); static int -fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) +fingerprint(struct libalias *la, struct alias_data *ah) { if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL) @@ -91,7 +91,7 @@ fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) } static int -fingerprintgre(struct libalias *la, struct ip *pip, struct alias_data *ah) +fingerprintgre(struct libalias *la, struct alias_data *ah) { return (0); diff --git a/sys/netinet/libalias/alias_skinny.c b/sys/netinet/libalias/alias_skinny.c index e726e55..12be97a 100644 --- a/sys/netinet/libalias/alias_skinny.c +++ b/sys/netinet/libalias/alias_skinny.c @@ -57,7 +57,7 @@ static void AliasHandleSkinny(struct libalias *, struct ip *, struct alias_link *); static int -fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) +fingerprint(struct libalias *la, struct alias_data *ah) { if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL) diff --git a/sys/netinet/libalias/alias_smedia.c b/sys/netinet/libalias/alias_smedia.c index e748ad7..2e1b17e 100644 --- a/sys/netinet/libalias/alias_smedia.c +++ b/sys/netinet/libalias/alias_smedia.c @@ -132,7 +132,7 @@ static void AliasHandleRtspOut(struct libalias *, struct ip *, struct alias_link *, int maxpacketsize); static int -fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) +fingerprint(struct libalias *la, struct alias_data *ah) { if (ah->dport != NULL && ah->aport != NULL && ah->sport != NULL && |