From owner-svn-src-all@FreeBSD.ORG Wed Apr 8 11:56:50 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 260741065728; Wed, 8 Apr 2009 11:56:50 +0000 (UTC) (envelope-from piso@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 128F98FC1D; Wed, 8 Apr 2009 11:56:50 +0000 (UTC) (envelope-from piso@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n38Bun4U058078; Wed, 8 Apr 2009 11:56:49 GMT (envelope-from piso@svn.freebsd.org) Received: (from piso@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n38Bun91058068; Wed, 8 Apr 2009 11:56:49 GMT (envelope-from piso@svn.freebsd.org) Message-Id: <200904081156.n38Bun91058068@svn.freebsd.org> From: Paolo Pisati Date: Wed, 8 Apr 2009 11:56:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r190841 - in head/sys: . netinet/libalias X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Apr 2009 11:56:51 -0000 Author: piso Date: Wed Apr 8 11:56:49 2009 New Revision: 190841 URL: http://svn.freebsd.org/changeset/base/190841 Log: -don't pass down, to module's fingerprint function, unused data like a pointer to the ip header. -style -spacing Modified: head/sys/ (props changed) head/sys/netinet/libalias/alias_cuseeme.c head/sys/netinet/libalias/alias_dummy.c head/sys/netinet/libalias/alias_ftp.c head/sys/netinet/libalias/alias_irc.c head/sys/netinet/libalias/alias_mod.c head/sys/netinet/libalias/alias_mod.h head/sys/netinet/libalias/alias_nbt.c head/sys/netinet/libalias/alias_pptp.c head/sys/netinet/libalias/alias_skinny.c head/sys/netinet/libalias/alias_smedia.c Modified: head/sys/netinet/libalias/alias_cuseeme.c ============================================================================== --- head/sys/netinet/libalias/alias_cuseeme.c Wed Apr 8 11:35:47 2009 (r190840) +++ head/sys/netinet/libalias/alias_cuseeme.c Wed Apr 8 11:56:49 2009 (r190841) @@ -64,7 +64,7 @@ AliasHandleCUSeeMeIn(struct libalias *la 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) Modified: head/sys/netinet/libalias/alias_dummy.c ============================================================================== --- head/sys/netinet/libalias/alias_dummy.c Wed Apr 8 11:35:47 2009 (r190840) +++ head/sys/netinet/libalias/alias_dummy.c Wed Apr 8 11:56:49 2009 (r190841) @@ -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) { /* Modified: head/sys/netinet/libalias/alias_ftp.c ============================================================================== --- head/sys/netinet/libalias/alias_ftp.c Wed Apr 8 11:35:47 2009 (r190840) +++ head/sys/netinet/libalias/alias_ftp.c Wed Apr 8 11:56:49 2009 (r190841) @@ -104,7 +104,7 @@ AliasHandleFtpOut(struct libalias *, str 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 || Modified: head/sys/netinet/libalias/alias_irc.c ============================================================================== --- head/sys/netinet/libalias/alias_irc.c Wed Apr 8 11:35:47 2009 (r190840) +++ head/sys/netinet/libalias/alias_irc.c Wed Apr 8 11:56:49 2009 (r190841) @@ -93,7 +93,7 @@ AliasHandleIrcOut(struct libalias *, str 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 || Modified: head/sys/netinet/libalias/alias_mod.c ============================================================================== --- head/sys/netinet/libalias/alias_mod.c Wed Apr 8 11:35:47 2009 (r190840) +++ head/sys/netinet/libalias/alias_mod.c Wed Apr 8 11:56:49 2009 (r190841) @@ -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_hand 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_hand 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); Modified: head/sys/netinet/libalias/alias_mod.h ============================================================================== --- head/sys/netinet/libalias/alias_mod.h Wed Apr 8 11:35:47 2009 (r190840) +++ head/sys/netinet/libalias/alias_mod.h Wed Apr 8 11:56:49 2009 (r190841) @@ -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; }; Modified: head/sys/netinet/libalias/alias_nbt.c ============================================================================== --- head/sys/netinet/libalias/alias_nbt.c Wed Apr 8 11:35:47 2009 (r190840) +++ head/sys/netinet/libalias/alias_nbt.c Wed Apr 8 11:56:49 2009 (r190841) @@ -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, struc } 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 || Modified: head/sys/netinet/libalias/alias_pptp.c ============================================================================== --- head/sys/netinet/libalias/alias_pptp.c Wed Apr 8 11:35:47 2009 (r190840) +++ head/sys/netinet/libalias/alias_pptp.c Wed Apr 8 11:56:49 2009 (r190841) @@ -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 } static int -fingerprintgre(struct libalias *la, struct ip *pip, struct alias_data *ah) +fingerprintgre(struct libalias *la, struct alias_data *ah) { return (0); Modified: head/sys/netinet/libalias/alias_skinny.c ============================================================================== --- head/sys/netinet/libalias/alias_skinny.c Wed Apr 8 11:35:47 2009 (r190840) +++ head/sys/netinet/libalias/alias_skinny.c Wed Apr 8 11:56:49 2009 (r190841) @@ -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) Modified: head/sys/netinet/libalias/alias_smedia.c ============================================================================== --- head/sys/netinet/libalias/alias_smedia.c Wed Apr 8 11:35:47 2009 (r190840) +++ head/sys/netinet/libalias/alias_smedia.c Wed Apr 8 11:56:49 2009 (r190841) @@ -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 &&