PERFORCE change 142382 for review
Paolo Pisati
piso at FreeBSD.org
Tue May 27 10:45:17 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=142382
Change 142382 by piso at 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 &&
More information about the p4-projects
mailing list