svn commit: r210250 - user/jmallett/octeon/sys/netinet/libalias
Juli Mallett
jmallett at FreeBSD.org
Mon Jul 19 19:40:39 UTC 2010
Author: jmallett
Date: Mon Jul 19 19:40:38 2010
New Revision: 210250
URL: http://svn.freebsd.org/changeset/base/210250
Log:
Unbreak compiling libalias modules into the kernel;
o) Make the 'handlers' array static to each file since without a unique name
there is a symbol collision in the kernel (why linker sets aren't simply
used, I don't know.)
o) Modify sysinit orders to run module inits after the initialization of the
rwlock they require.
In this branch because it was blocking an Octeon user; I don't have an interest
in libalias in general and will leave it to someone else to decide whether to
commit this to trunk.
Modified:
user/jmallett/octeon/sys/netinet/libalias/alias_cuseeme.c
user/jmallett/octeon/sys/netinet/libalias/alias_dummy.c
user/jmallett/octeon/sys/netinet/libalias/alias_ftp.c
user/jmallett/octeon/sys/netinet/libalias/alias_irc.c
user/jmallett/octeon/sys/netinet/libalias/alias_nbt.c
user/jmallett/octeon/sys/netinet/libalias/alias_pptp.c
user/jmallett/octeon/sys/netinet/libalias/alias_skinny.c
user/jmallett/octeon/sys/netinet/libalias/alias_smedia.c
user/jmallett/octeon/sys/netinet/libalias/libalias.3
Modified: user/jmallett/octeon/sys/netinet/libalias/alias_cuseeme.c
==============================================================================
--- user/jmallett/octeon/sys/netinet/libalias/alias_cuseeme.c Mon Jul 19 19:19:33 2010 (r210249)
+++ user/jmallett/octeon/sys/netinet/libalias/alias_cuseeme.c Mon Jul 19 19:40:38 2010 (r210250)
@@ -91,7 +91,7 @@ protohandlerout(struct libalias *la, str
}
/* Kernel module definition. */
-struct proto_handler handlers[] = {
+static struct proto_handler handlers[] = {
{
.pri = 120,
.dir = OUT,
@@ -138,7 +138,7 @@ alias_mod = {
};
#ifdef _KERNEL
-DECLARE_MODULE(alias_cuseeme, alias_mod, SI_SUB_DRIVERS, SI_ORDER_SECOND);
+DECLARE_MODULE(alias_cuseeme, alias_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD);
MODULE_VERSION(alias_cuseeme, 1);
MODULE_DEPEND(alias_cuseeme, libalias, 1, 1, 1);
#endif
Modified: user/jmallett/octeon/sys/netinet/libalias/alias_dummy.c
==============================================================================
--- user/jmallett/octeon/sys/netinet/libalias/alias_dummy.c Mon Jul 19 19:19:33 2010 (r210249)
+++ user/jmallett/octeon/sys/netinet/libalias/alias_dummy.c Mon Jul 19 19:40:38 2010 (r210250)
@@ -101,7 +101,7 @@ protohandler(struct libalias *la, struct
* ITS EXACT NAME: handlers.
*/
-struct proto_handler handlers [] = {
+static struct proto_handler handlers [] = {
{
.pri = 666,
.dir = IN|OUT,
@@ -140,7 +140,7 @@ moduledata_t alias_mod = {
};
#ifdef _KERNEL
-DECLARE_MODULE(alias_dummy, alias_mod, SI_SUB_DRIVERS, SI_ORDER_SECOND);
+DECLARE_MODULE(alias_dummy, alias_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD);
MODULE_VERSION(alias_dummy, 1);
MODULE_DEPEND(alias_dummy, libalias, 1, 1, 1);
#endif
Modified: user/jmallett/octeon/sys/netinet/libalias/alias_ftp.c
==============================================================================
--- user/jmallett/octeon/sys/netinet/libalias/alias_ftp.c Mon Jul 19 19:19:33 2010 (r210249)
+++ user/jmallett/octeon/sys/netinet/libalias/alias_ftp.c Mon Jul 19 19:40:38 2010 (r210250)
@@ -124,7 +124,7 @@ protohandler(struct libalias *la, struct
return (0);
}
-struct proto_handler handlers[] = {
+static struct proto_handler handlers[] = {
{
.pri = 80,
.dir = OUT,
@@ -163,7 +163,7 @@ moduledata_t alias_mod = {
};
#ifdef _KERNEL
-DECLARE_MODULE(alias_ftp, alias_mod, SI_SUB_DRIVERS, SI_ORDER_SECOND);
+DECLARE_MODULE(alias_ftp, alias_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD);
MODULE_VERSION(alias_ftp, 1);
MODULE_DEPEND(alias_ftp, libalias, 1, 1, 1);
#endif
Modified: user/jmallett/octeon/sys/netinet/libalias/alias_irc.c
==============================================================================
--- user/jmallett/octeon/sys/netinet/libalias/alias_irc.c Mon Jul 19 19:19:33 2010 (r210249)
+++ user/jmallett/octeon/sys/netinet/libalias/alias_irc.c Mon Jul 19 19:40:38 2010 (r210250)
@@ -117,7 +117,7 @@ protohandler(struct libalias *la, struct
return (0);
}
-struct proto_handler handlers[] = {
+static struct proto_handler handlers[] = {
{
.pri = 90,
.dir = OUT,
@@ -157,7 +157,7 @@ moduledata_t alias_mod = {
/* Kernel module definition. */
#ifdef _KERNEL
-DECLARE_MODULE(alias_irc, alias_mod, SI_SUB_DRIVERS, SI_ORDER_SECOND);
+DECLARE_MODULE(alias_irc, alias_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD);
MODULE_VERSION(alias_irc, 1);
MODULE_DEPEND(alias_irc, libalias, 1, 1, 1);
#endif
Modified: user/jmallett/octeon/sys/netinet/libalias/alias_nbt.c
==============================================================================
--- user/jmallett/octeon/sys/netinet/libalias/alias_nbt.c Mon Jul 19 19:19:33 2010 (r210249)
+++ user/jmallett/octeon/sys/netinet/libalias/alias_nbt.c Mon Jul 19 19:40:38 2010 (r210250)
@@ -127,7 +127,7 @@ protohandler2out(struct libalias *la, st
}
/* Kernel module definition. */
-struct proto_handler handlers[] = {
+static struct proto_handler handlers[] = {
{
.pri = 130,
.dir = IN|OUT,
@@ -180,7 +180,7 @@ moduledata_t alias_mod = {
};
#ifdef _KERNEL
-DECLARE_MODULE(alias_nbt, alias_mod, SI_SUB_DRIVERS, SI_ORDER_SECOND);
+DECLARE_MODULE(alias_nbt, alias_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD);
MODULE_VERSION(alias_nbt, 1);
MODULE_DEPEND(alias_nbt, libalias, 1, 1, 1);
#endif
Modified: user/jmallett/octeon/sys/netinet/libalias/alias_pptp.c
==============================================================================
--- user/jmallett/octeon/sys/netinet/libalias/alias_pptp.c Mon Jul 19 19:19:33 2010 (r210249)
+++ user/jmallett/octeon/sys/netinet/libalias/alias_pptp.c Mon Jul 19 19:40:38 2010 (r210250)
@@ -133,7 +133,7 @@ protohandlergreout(struct libalias *la,
}
/* Kernel module definition. */
-struct proto_handler handlers[] = {
+static struct proto_handler handlers[] = {
{
.pri = 200,
.dir = IN,
@@ -197,7 +197,7 @@ moduledata_t alias_mod = {
};
#ifdef _KERNEL
-DECLARE_MODULE(alias_pptp, alias_mod, SI_SUB_DRIVERS, SI_ORDER_SECOND);
+DECLARE_MODULE(alias_pptp, alias_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD);
MODULE_VERSION(alias_pptp, 1);
MODULE_DEPEND(alias_pptp, libalias, 1, 1, 1);
#endif
Modified: user/jmallett/octeon/sys/netinet/libalias/alias_skinny.c
==============================================================================
--- user/jmallett/octeon/sys/netinet/libalias/alias_skinny.c Mon Jul 19 19:19:33 2010 (r210249)
+++ user/jmallett/octeon/sys/netinet/libalias/alias_skinny.c Mon Jul 19 19:40:38 2010 (r210250)
@@ -76,7 +76,7 @@ protohandler(struct libalias *la, struct
return (0);
}
-struct proto_handler handlers[] = {
+static struct proto_handler handlers[] = {
{
.pri = 110,
.dir = IN|OUT,
@@ -115,7 +115,7 @@ moduledata_t alias_mod = {
};
#ifdef _KERNEL
-DECLARE_MODULE(alias_skinny, alias_mod, SI_SUB_DRIVERS, SI_ORDER_SECOND);
+DECLARE_MODULE(alias_skinny, alias_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD);
MODULE_VERSION(alias_skinny, 1);
MODULE_DEPEND(alias_skinny, libalias, 1, 1, 1);
#endif
Modified: user/jmallett/octeon/sys/netinet/libalias/alias_smedia.c
==============================================================================
--- user/jmallett/octeon/sys/netinet/libalias/alias_smedia.c Mon Jul 19 19:19:33 2010 (r210249)
+++ user/jmallett/octeon/sys/netinet/libalias/alias_smedia.c Mon Jul 19 19:40:38 2010 (r210250)
@@ -160,7 +160,7 @@ protohandler(struct libalias *la, struct
return (0);
}
-struct proto_handler handlers[] = {
+static struct proto_handler handlers[] = {
{
.pri = 100,
.dir = OUT,
@@ -199,7 +199,7 @@ moduledata_t alias_mod = {
};
#ifdef _KERNEL
-DECLARE_MODULE(alias_smedia, alias_mod, SI_SUB_DRIVERS, SI_ORDER_SECOND);
+DECLARE_MODULE(alias_smedia, alias_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD);
MODULE_VERSION(alias_smedia, 1);
MODULE_DEPEND(alias_smedia, libalias, 1, 1, 1);
#endif
Modified: user/jmallett/octeon/sys/netinet/libalias/libalias.3
==============================================================================
--- user/jmallett/octeon/sys/netinet/libalias/libalias.3 Mon Jul 19 19:19:33 2010 (r210249)
+++ user/jmallett/octeon/sys/netinet/libalias/libalias.3 Mon Jul 19 19:40:38 2010 (r210250)
@@ -1276,7 +1276,7 @@ module.
From
.Pa alias_dummy.c :
.Bd -literal
-struct proto_handler handlers [] = {{666, IN|OUT, UDP|TCP,
+static struct proto_handler handlers [] = {{666, IN|OUT, UDP|TCP,
&fingerprint, &protohandler}};
.Ed
.Pp
More information about the svn-src-user
mailing list