PERFORCE change 100722 for review
Paolo Pisati
piso at FreeBSD.org
Thu Jul 6 11:23:46 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=100722
Change 100722 by piso at piso_newluxor on 2006/07/06 11:23:15
Convert return code to use errno:
OK => 0
NOK => -1
EHDNOF => ENOENT
EHDCON => EEXIST
Affected files ...
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#5 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_cuseeme.c#3 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_dummy.c#2 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_ftp.c#3 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#3 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#13 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.h#13 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_nbt.c#3 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_pptp.c#3 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_skinny.c#3 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_smedia.c#3 edit
Differences ...
==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#5 (text+ko) ====
@@ -1240,7 +1240,7 @@
/* Walk out chain. */
error = find_handler(IN, IP, la, pip, &ad);
- if (error == OK)
+ if (error == 0)
iresult = PKT_ALIAS_OK;
else
iresult = ProtoAliasIn(la, pip);
@@ -1365,7 +1365,7 @@
};
/* Walk out chain. */
error = find_handler(OUT, IP, la, pip, &ad);
- if (error == OK)
+ if (error == 0)
iresult = PKT_ALIAS_OK;
else
iresult = ProtoAliasOut(la, pip, create);
@@ -1512,7 +1512,7 @@
LibAliasLoadModule(buf);
}
}
- return (OK);
+ return (0);
}
int
@@ -1528,13 +1528,13 @@
handle = dlopen (path, RTLD_LAZY);
if (!handle) {
fputs (dlerror(), stderr);
- return (NOK);
+ return (-1);
}
p = dlsym(handle, "alias_mod");
if ((error = dlerror()) != NULL) {
fputs(error, stderr);
- return (NOK);
+ return (-1);
}
t = malloc(sizeof(struct dll));
@@ -1542,20 +1542,20 @@
return (ENOMEM);
strncpy(t->name, p->name, DLL_LEN);
t->handle = handle;
- if (attach_dll(t) == EHDCON) {
+ if (attach_dll(t) == EEXIST) {
free(t);
fputs("dll conflict", stderr);
- return (NOK);
+ return (-1);
}
m = dlsym(t->handle, "handlers");
if ((error = dlerror()) != NULL) {
fputs(error, stderr);
- return (NOK);
+ return (-1);
}
attach_handlers(m);
- return (OK);
+ return (0);
}
int
==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_cuseeme.c#3 (text+ko) ====
@@ -76,10 +76,10 @@
fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) {
if (ah->dport == NULL || ah->original_address == NULL)
- return (NOK);
+ return (-1);
if (ntohs(*ah->dport) == CUSEEME_PORT_NUMBER)
- return (OK);
- return (NOK);
+ return (0);
+ return (-1);
}
#ifdef _KERNEL
@@ -89,7 +89,7 @@
protohandlerin(struct libalias *la, struct ip *pip, struct alias_data *ah) {
AliasHandleCUSeeMeIn(la, pip, *ah->original_address);
- return (OK);
+ return (0);
}
#ifdef _KERNEL
@@ -99,7 +99,7 @@
protohandlerout(struct libalias *la, struct ip *pip, struct alias_data *ah) {
AliasHandleCUSeeMeOut(la, pip, ah->lnk);
- return (OK);
+ return (0);
}
/* Kernel module definition. */
==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_dummy.c#2 (text+ko) ====
@@ -76,19 +76,19 @@
/*
* check here all the data that will be used later, if any field
- * is empy/NULL, return a NOK value
+ * is empy/NULL, return a -1 value
*/
if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL ||
ah->maxpacketsize == 0)
- return (NOK);
+ return (-1);
/*
* fingerprint the incoming packet, if it matches any conditions
* return an OK value
*/
if (ntohs(*ah->dport) == 123
|| ntohs(*ah->sport) == 456)
- return (OK); /* i know how to handle it... */
- return (NOK); /* i don't know this packet... */
+ return (0); /* i know how to handle it... */
+ return (-1); /* i don't know this packet... */
}
/*
@@ -103,7 +103,7 @@
protohandler(struct libalias *la, struct ip *pip, struct alias_data *ah) {
AliasHandleDummy(la, pip, ah);
- return (OK);
+ return (0);
}
/*
==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_ftp.c#3 (text+ko) ====
@@ -115,11 +115,11 @@
if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL ||
ah->maxpacketsize == 0)
- return (NOK);
+ return (-1);
if (ntohs(*ah->dport) == FTP_CONTROL_PORT_NUMBER
|| ntohs(*ah->sport) == FTP_CONTROL_PORT_NUMBER)
- return (OK);
- return (NOK);
+ return (0);
+ return (-1);
}
#ifdef _KERNEL
@@ -129,7 +129,7 @@
protohandler(struct libalias *la, struct ip *pip, struct alias_data *ah) {
AliasHandleFtpOut(la, pip, ah->lnk, ah->maxpacketsize);
- return (OK);
+ return (0);
}
struct proto_handler handlers[] = {{80, OUT, TCP, &fingerprint,
@@ -188,9 +188,7 @@
static int ParseFtp229Reply(struct libalias *la, char *, int);
static void NewFtpMessage(struct libalias *la, struct ip *, struct alias_link *, int, int);
-#ifdef _KERNEL
static
-#endif
void
AliasHandleFtpOut(
struct libalias *la,
==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#3 (text+ko) ====
@@ -104,11 +104,11 @@
if (ah->dport == NULL || ah->dport == NULL || ah->lnk == NULL ||
ah->maxpacketsize == 0)
- return (NOK);
+ return (-1);
if (ntohs(*ah->dport) == IRC_CONTROL_PORT_NUMBER_1
|| ntohs(*ah->dport) == IRC_CONTROL_PORT_NUMBER_2)
- return (OK);
- return (NOK);
+ return (0);
+ return (-1);
}
#ifdef _KERNEL
@@ -118,7 +118,7 @@
protohandler(struct libalias *la, struct ip *pip, struct alias_data *ah) {
AliasHandleIrcOut(la, pip, ah->lnk, ah->maxpacketsize);
- return (OK);
+ return (0);
}
struct proto_handler handlers[] = {{90, OUT, TCP, &fingerprint,
==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#13 (text+ko) ====
@@ -31,10 +31,12 @@
#include <sys/lock.h>
#include <sys/rwlock.h>
#include <sys/proc.h>
+#include <sys/errno.h>
#else
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
+#include <errno.h>
#endif
#include <netinet/in_systm.h>
@@ -172,15 +174,15 @@
LIST_FOREACH(b, &handler_chain, entries) {
if ((b->pri == p->pri) && (b->dir == p->dir) &&
(b->proto == p->proto))
- return (EHDCON); /* priority conflict */
+ return (EEXIST); /* priority conflict */
if (b->pri > p->pri) {
LIST_INSERT_BEFORE(b, p, entries);
- return (OK);
+ return (0);
}
}
/* end of list or got right position, insert here */
LIST_INSERT_AFTER(b, p, entries);
- return (OK);
+ return (0);
}
static int
@@ -191,21 +193,21 @@
LIST_FOREACH_SAFE(b, &handler_chain, entries, b_tmp) {
if (b == p) {
LIST_REMOVE(b, entries);
- return (OK);
+ return (0);
}
}
- return (EHDNOF); /* handler not found */
+ return (ENOENT); /* handler not found */
}
int
attach_handlers(struct proto_handler *_p) {
- int i, res = NOK;
+ int i, res = -1;
LIBALIAS_WLOCK();
for (i=0; 1; i++) {
if (*((int *)&_p[i]) == EOH) break;
res = _attach_handler(&_p[i]);
- if (res != OK) break;
+ if (res != 0) break;
}
LIBALIAS_WUNLOCK();
return (res);
@@ -213,13 +215,13 @@
int
detach_handlers(struct proto_handler *_p) {
- int i, res = NOK;
+ int i, res = -1;
LIBALIAS_WLOCK();
for (i=0; 1; i++) {
if (*((int *)&_p[i]) == EOH) break;
res = _detach_handler(&_p[i]);
- if (res != OK) break;
+ if (res != 0) break;
}
LIBALIAS_WUNLOCK();
return (res);
@@ -227,7 +229,7 @@
int
detach_handler(struct proto_handler *_p) {
- int res = NOK;
+ int res = -1;
LIBALIAS_WLOCK();
res = _detach_handler(_p);
@@ -238,13 +240,13 @@
int
find_handler(int8_t dir, int8_t proto, struct libalias *la, struct ip *pip, struct alias_data *ad) {
struct proto_handler *p;
- int err = EHDNOF;
+ int err = ENOENT;
LIBALIAS_RLOCK();
LIST_FOREACH(p, &handler_chain, entries) {
if ((p->dir & dir) && (p->proto & proto))
- if (p->fingerprint(la, pip, ad) == OK) {
+ if (p->fingerprint(la, pip, ad) == 0) {
err = p->protohandler(la, pip, ad);
break;
}
@@ -267,11 +269,11 @@
SLIST_FOREACH(b, &dll_chain, next) {
if (!strncmp(b->name, p->name, DLL_LEN))
- return (EHDCON); /* dll name conflict */
+ return (EEXIST); /* dll name conflict */
}
/* end of list, insert here */
SLIST_INSERT_HEAD(&dll_chain, p, next);
- return (OK);
+ return (0);
}
void *
==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.h#13 (text+ko) ====
@@ -113,29 +113,10 @@
void *detach_dll(char *);
struct dll *walk_dll_chain(void);
-/* General condition of success & failure. */
-#define OK 1
-#define NOK -1
-
/* End of handlers. */
#define EOH -1
/*
- * Handler/dll conflict - tried to attach a protocol handleror a dll,
- * but found another one with same priority, direction and working
- * protocol(proto handler) or name (dll) already in chain.
- */
-
-#define EHDCON 2
-
-/*
- * Handler/dll not found - tried to detach/search a protocol module
- * handler or a dll not present in chain.
- */
-
-#define EHDNOF 3
-
-/*
* Some defines borrowed from sys/module.h used to compile a kld
* in userland as a shared lib.
*/
==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_nbt.c#3 (text+ko) ====
@@ -92,11 +92,11 @@
if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL ||
ah->alias_address == NULL || ah->alias_port == NULL)
- return (NOK);
+ return (-1);
if (ntohs(*ah->dport) == NETBIOS_DGM_PORT_NUMBER
|| ntohs(*ah->sport) == NETBIOS_DGM_PORT_NUMBER)
- return (OK);
- return (NOK);
+ return (0);
+ return (-1);
}
#ifdef _KERNEL
@@ -106,7 +106,7 @@
protohandler1(struct libalias *la, struct ip *pip, struct alias_data *ah) {
AliasHandleUdpNbt(la, pip, ah->lnk, ah->alias_address, *ah->alias_port);
- return (OK);
+ return (0);
}
#ifdef _KERNEL
@@ -117,11 +117,11 @@
if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL ||
ah->alias_address == NULL || ah->alias_port == NULL)
- return (NOK);
+ return (-1);
if (ntohs(*ah->dport) == NETBIOS_NS_PORT_NUMBER
|| ntohs(*ah->sport) == NETBIOS_NS_PORT_NUMBER)
- return (OK);
- return (NOK);
+ return (0);
+ return (-1);
}
#ifdef _KERNEL
@@ -132,7 +132,7 @@
AliasHandleUdpNbtNS(la, pip, ah->lnk, &pip->ip_src, ah->sport,
ah->alias_address, ah->alias_port);
- return (OK);
+ return (0);
}
/* Kernel module definition. */
==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_pptp.c#3 (text+ko) ====
@@ -99,11 +99,11 @@
fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) {
if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL)
- return (NOK);
+ return (-1);
if (ntohs(*ah->dport) == PPTP_CONTROL_PORT_NUMBER
|| ntohs(*ah->sport) == PPTP_CONTROL_PORT_NUMBER)
- return (OK);
- return (NOK);
+ return (0);
+ return (-1);
}
#ifdef _KERNEL
@@ -112,7 +112,7 @@
int
fingerprintgre(struct libalias *la, struct ip *pip, struct alias_data *ah) {
- return (OK);
+ return (0);
}
#ifdef _KERNEL
@@ -122,7 +122,7 @@
protohandlerin(struct libalias *la, struct ip *pip, struct alias_data *ah) {
AliasHandlePptpIn(la, pip, ah->lnk);
- return (OK);
+ return (0);
}
#ifdef _KERNEL
@@ -132,7 +132,7 @@
protohandlerout(struct libalias *la, struct ip *pip, struct alias_data *ah) {
AliasHandlePptpOut(la, pip, ah->lnk);
- return (OK);
+ return (0);
}
#ifdef _KERNEL
@@ -143,8 +143,8 @@
if (la->packetAliasMode & PKT_ALIAS_PROXY_ONLY ||
AliasHandlePptpGreIn(la, pip) == 0)
- return (OK);
- return (NOK);
+ return (0);
+ return (-1);
}
#ifdef _KERNEL
@@ -154,8 +154,8 @@
protohandlergreout(struct libalias *la, struct ip *pip, struct alias_data *ah) {
if (AliasHandlePptpGreOut(la, pip) == 0)
- return (OK);
- return (NOK);
+ return (0);
+ return (-1);
}
/* Kernel module definition. */
==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_skinny.c#3 (text+ko) ====
@@ -74,11 +74,11 @@
fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) {
if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL)
- return (NOK);
+ return (-1);
if (la->skinnyPort != 0 && (ntohs(*ah->sport) == la->skinnyPort ||
ntohs(*ah->dport) == la->skinnyPort))
- return (OK);
- return (NOK);
+ return (0);
+ return (-1);
}
#ifdef _KERNEL
@@ -88,7 +88,7 @@
protohandler(struct libalias *la, struct ip *pip, struct alias_data *ah) {
AliasHandleSkinny(la, pip, ah->lnk);
- return (OK);
+ return (0);
}
struct proto_handler handlers[] = {{110, IN|OUT, TCP, &fingerprint,
==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_smedia.c#3 (text+ko) ====
@@ -144,14 +144,14 @@
if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL ||
ah->maxpacketsize == 0)
- return (NOK);
+ return (-1);
if (ntohs(*ah->dport) == RTSP_CONTROL_PORT_NUMBER_1
|| ntohs(*ah->sport) == RTSP_CONTROL_PORT_NUMBER_1
|| ntohs(*ah->dport) == RTSP_CONTROL_PORT_NUMBER_2
|| ntohs(*ah->sport) == RTSP_CONTROL_PORT_NUMBER_2
|| ntohs(*ah->dport) == TFTP_PORT_NUMBER)
- return (OK);
- return (NOK);
+ return (0);
+ return (-1);
}
#ifdef _KERNEL
@@ -164,7 +164,7 @@
FindRtspOut(la, pip->ip_src, pip->ip_dst,
*ah->sport, *ah->alias_port, IPPROTO_UDP);
else AliasHandleRtspOut(la, pip, ah->lnk, ah->maxpacketsize);
- return (OK);
+ return (0);
}
struct proto_handler handlers[] = {{100, OUT, TCP|UDP, &fingerprint,
More information about the p4-projects
mailing list