From owner-p4-projects@FreeBSD.ORG Tue May 27 10:45:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AF081065690; Tue, 27 May 2008 10:45:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C5B9106568C for ; Tue, 27 May 2008 10:45:17 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ECE2B8FC20 for ; Tue, 27 May 2008 10:45:16 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4RAjGYP071766 for ; Tue, 27 May 2008 10:45:16 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4RAjGmQ071764 for perforce@freebsd.org; Tue, 27 May 2008 10:45:16 GMT (envelope-from piso@freebsd.org) Date: Tue, 27 May 2008 10:45:16 GMT Message-Id: <200805271045.m4RAjGmQ071764@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 142382 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 May 2008 10:45:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=142382 Change 142382 by piso@piso_ferret on 2008/05/27 10:44:31 -simplify module logic: don't pass down a pointer to the ip pkt as it wasn't used at all -quiet a compiler warning Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_cuseeme.c#18 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_dummy.c#17 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_ftp.c#24 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#30 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#31 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.h#26 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_nbt.c#17 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_pptp.c#17 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_skinny.c#16 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_smedia.c#24 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_cuseeme.c#18 (text+ko) ==== @@ -64,7 +64,7 @@ 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) ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_dummy.c#17 (text+ko) ==== @@ -60,7 +60,7 @@ 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) { /* ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_ftp.c#24 (text+ko) ==== @@ -103,7 +103,7 @@ 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 || ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#30 (text+ko) ==== @@ -92,7 +92,7 @@ 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 || ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#31 (text+ko) ==== @@ -219,7 +219,7 @@ } int -find_handler(int8_t dir, int8_t proto, struct libalias *la, struct ip *pip, +find_handler(int8_t dir, int8_t proto, struct libalias *la, __unused struct ip *pip, struct alias_data *ad) { struct proto_handler *p; @@ -229,7 +229,7 @@ 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; } ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.h#26 (text+ko) ==== @@ -80,10 +80,10 @@ 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; }; ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_nbt.c#17 (text+ko) ==== @@ -76,7 +76,7 @@ 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 || @@ -97,7 +97,7 @@ } 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 || ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_pptp.c#17 (text+ko) ==== @@ -79,7 +79,7 @@ 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 @@ } static int -fingerprintgre(struct libalias *la, struct ip *pip, struct alias_data *ah) +fingerprintgre(struct libalias *la, struct alias_data *ah) { return (0); ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_skinny.c#16 (text+ko) ==== @@ -57,7 +57,7 @@ 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) ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_smedia.c#24 (text+ko) ==== @@ -132,7 +132,7 @@ 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 &&