From a718957b7f01eb8e82849dd8881646b7424bd53d Mon Sep 17 00:00:00 2001
From: Aaron Blakely <aaron@ephasic.org>
Date: Tue, 7 Apr 2015 01:56:50 -0500
Subject: [PATCH] Fixed the handler/module system

---
 lib/module.h       |   1 +
 mods/test.so       | Bin 8204 -> 8102 bytes
 mods/test/Makefile |  11 +++++++----
 mods/test/build.sh |   0
 mods/test/test.c   |   9 +++------
 src/events.c       |  21 +++++++++++++++++++--
 src/main.c         |   6 ------
 src/module.c       |  14 +++++++++++---
 8 files changed, 41 insertions(+), 21 deletions(-)
 delete mode 100755 mods/test/build.sh

diff --git a/lib/module.h b/lib/module.h
index 3b130c0..0f2e301 100644
--- a/lib/module.h
+++ b/lib/module.h
@@ -4,5 +4,6 @@
 #include "irc.h"
 
 void load_module(struct irc_conn *bot, char *where, int stype, char *file);
+void export_handler(int type, char *hname);
 
 #endif
\ No newline at end of file
diff --git a/mods/test.so b/mods/test.so
index 75064ab19ca90cf3933ec94d87736977ab41b31b..8fa03f11d97fa6d35b1eb022a8a0831012e40f62 100755
GIT binary patch
delta 2408
zcmZ`)Z){XW5Z}E&y?e*~d)K?ZyKC#cYptHfcn4ALiZtyD0UwFzA@+koXiKEF5e2nG
zFp{>ZVw-D|Ud9iEgnu6}#1sSJ1EPtxDSwKIcxWW`8;!wSBPQj8gqp}XySH200+YO*
zo!`#R%$wbv8E*Nac{Hr*6@*hunUQS%skAZXEK8CTqH}=a$n+ClE+W_YL~_5SjO+Om
znwk|#S)r88Uu{!u!tw%#M%osCl)Y)@5NR4N&{*TDokxGG|NXpQO&<N>NAk?7y2Bez
zvQ;a7F8pM4!{fS@*jf~Zx$*OYYH3yv*>SpvI-tX%(U;i><CZY&!*9+KrW-ik3UO;P
zvLE&R<W4E$*B9+1WEeJEwcfr*tac+FAPQOT(a&)=DLQbnh#GMoAS=jiaTIy6)+z7<
zLO&(<w6(qU&hB@iWX-@@+YUHkt2cJz8ne%6Z?sz>#6qN<l!#uWo=Cai)44u#YlB+5
z1~qoK=jI|*flc-oVGPl*u)#ucz-hZiop8xs-)j!sb{2aPEJiW?MLS*qbKs(Lvh@5K
zmrhCzYjO0&T5!hXF6M9cW(lcb6_eSK%@(-)G?Ur=nH}eH9h2G7&Yt0Nl*u+GALnv_
z$sO!aXGalWftWe_Nku2-r{g`AQh~=YDyg-vX%5$jIdsc-ZOh&r=0MXRlY87|uIVS7
z6~AOwMrwa?=;Wo5hKtD1-X#b-VjG!NqZGV|z+s%4jnnVnx@<p)Q@Yi7W7}k>FZKxr
zg4PF``fwv@MK?WBRJSs9jK{mp9BJxwK%e7r<NM=2Ox4f#(cRGcduDEZ(HzM-%@NP9
z%t8*Kp=;*Qm9Lq>;<rpK*UHoi=Fknqi-X{HMtVPI%2F%Owb;%p#q~J9I>{oyocPV5
z1BmXO<92hK=FE{$JMR3BWm;}8UB5bsd170(h&*;xVB7=uN<9%w$yOA6F_iywVp?-n
zwg9J{{^wp{ZrO2nb?XfukglD(cCm{{tF15S$l2+Q{aY%nMP5YJH<9m$dFPY%E=2c0
zgHj*=7;%144X^*8Wu2$OGVFFZ38_I{rvKNuZsoiUMwOeOdsF<LBg)@3<MNGpn1CeT
z*5CI_ED|y&Du{giQ;_$@=n**UP0~@A@y6m#u_PWDImPZ662`!(9pb(i9Rvf%PU!IU
z(k#$uCG4TLm6yfd8-o8K_+7y(*waF)5<GRz@Ruk(1V$jKPO<bLNqz+S5$zQ2C9i{t
zKvEeL=pf7o(y9zm@^&yPldAj?$w#5TGU<{DI%J1$Dp#v#L}Zfh0UAs$Gy&NRroad$
zT{4$N2YeJ<t=<(GlH3gw!KCtkA)gPXT?vu3gcH_;R(oV$;Po9VY9)+@bWg^s^B>Q!
z2EoxnNLNgOnlK+qD+^5n8mrQ(tW*Ub-$=sHU)4-an5arBvYMq}zAEjJl{&+UA-A2?
z5;Oz*wPv~lE@;h4He9wb2sE5lrfbX6H88@TMdVSGvGQmocG3wmVGZxVOgLn9kW-*W
zw2d;&OLZTt`fS~b{Yhqgss0M0!+Q~JrOfrxRS%KLUW$9MUZ04BtUi+9+>e|_Lspe!
zkZYJ3CRLIwtVF2*9nlbMk49+<@`!7wm5(N=4ih*g;7(M7M2%m`pc9In$b@*c7HJW8
zR(jsbSJ~dp)tcI}tf%aQ3(+LB2P>?8l7h3i|CD?{!oaZw>oe7w<%|RVseU%nA`V?T
zVHJ>)Dl}o#X!y`xuUWV4VGWoyn*bJp<!RG7{$MM8Lg33=X%hO;&pI$_HTo)_cf#2k
uE%G+%Kg{okTr<ZtkHhs^%|3>jb<ja8T~pi#y8!20kHsl8#XPV*_SJuS2i*t&

delta 2567
zcmZ`*Z%kWN6u+<kXbY5<QeOYS`q)I78rqU<z#O4<ustF(GaF{QEd#ePI+KO5V$eik
zvdthgp`K)kBu2ImixSO-7-h@iYFOB2qJbrveV9r8u-GofNU|s&-0C^^y^93nN#6V2
z^E>CBbKZUD-TN*!k44A5uC#@5iE6+)Qyc4Jr)`=hkTHc565h#Qac~t;;RAs+290k>
zotIsz?xgBYYU=hu*FCG|v4YSj9jyAlco|BFl7TByu<^60);AlzOnNKo+?k2k=hxOh
zc(_bfBVI*#iR#AEijkS3HsYuTC%6pFF0cNeNO0+fE`to87`#$DjilXNA4k1~kJ31L
zfm>dMB|~WN9h~K4OL^6)XaV$lO6T{k;m_#&TL0t7mogh$TaT0TMQm1IAym0E;=Pm=
z2H04EM$Br!Ue^q)#R^xAJ59a)iIZS49Wol20pg|&uO!e;K}q`kaeSo)c1}}SR4-QK
z68fzYg?rFixpZHGg;l%-zBkD}F_WyBRn|gyWZK~~5v_|?&qd{%;ec6&{pKPVGJ6NZ
zt1Ncmj@Yn@FI>f|!@pUxA0v_7g6}%pf!(GK->}Z*H(j+UEMI*M?<K(~j!5sJnYm0J
zrTPofsXuZHT%RI+kh(RO=EMaesF8A)xjsQUJw<Mk>mQJACViai?~_ielpEsuyQI?-
z=6X@5Le){T8A<g_I$_8!@H)qZbPP3h+LSshf8>5_&+h)$)ZwPARbebqq>eT<<FxD)
zg-KREQ=qW+WOW4s2HXS#mSCF)?Xi5>4J7Q8q493t{dx1BIA7Wq+karLyCirTE5Yc)
zO?NFAwFA>6{OEoNeW)PE0X5n5jRi86CkAm8pw*mwoX=mMEWyz{j?|IXWp%VQt0s3@
z)nxJC6m1l#kss8No4f<Fm&h$?{*{|L(Dc)a=`fi_ksEDY(D-Z@QfJcr8<5VZqy2Yz
z@R3DzFzK132qNk+K9w@v%szgU&)=S->Ty98b>wYi`~Of!I<goAFY^&vmXZ1E^dfmt
z`8&7g#3B>Y+}--y7&oKy@Nz!k!*v}-r6h<t+$jib4N_9-q@FnIi7VA7S)wm~^yrbk
zEjYF_DPVj~!4%XVd$6Xhh?jB7VZ<J&vOZ;YB0CN{tsAOZkmseu9L}?bZN(PDOi_WA
zu?qAh|9dkj>(?fzafH{?2TDTw6p7doiZvB?0(i@@PFjW!9YN^=Tycb?G~^t?s=d^R
zDAaEx8Iy*XhRXnKED54-8{Q`%UNQ*1l2uY+$>+wADYl&&7v*IgyLEg+$Fn+~)A6E?
zU+EZ~i8%9;bPFP-A=fgk3W~rBa01y0y(EE8!gOiKmeyH(jM93SC|lqFMBE{lcsPM+
zIN=W2#oBl+Fy-Ft3hR{!9ET;GD$X*2%Md9G*~Ny6%XzG9vuj>oC4uEIT^6$admiP=
z>g~8aYhr_^J)4Wg@y3rSJPh10<WY*l`neW%pf6|B9>o^b*(l^Z^|qC>4>p$97mMBX
z7Jg+6QWU2=EbWEq@{mpJz&H;*#i60n2F_zg<r;j0ak*LQgHPpVTc=m6a2A&2dYgBh
zragp+_dTC@6&k1Ajm*p@V9_gMUo3h(#sWN4C7+DhBR-E2k0a<pw6ieBLY799rCInE
z*<v=&(ZTK!2C#gwK&w(1@w8E}$2>+CMp?qyQLed}3RQj?+vO#{2VV61kw4}47-i&7
z`KhO;@vguxe%UA1RD^B7frQ6j6kGw>m(kz4u<qkliW3XS{$2X1vGNt5)xZi_X94sD
zYNZ-Dk0FNE6i%m!mS8a;8-}d#AW#d-ey8n6ZYamhkqQ}CzO7;#Br3|JYKT<IzGrdA
zEX5C3^cFgEse=<0a%4NV7XIhNZrAx1y~MCStAl1qagZuyX@JJQG4!OLjkP}&DatN=
z#673^ta(UP%H})hzaF|IxBYjXgMKe&zN@T~wBLfC*9F|YeevUo?r3yJd)xEd4%XGy
L)oy~n)?NAs@N6w2

diff --git a/mods/test/Makefile b/mods/test/Makefile
index c83dea2..3df7c81 100644
--- a/mods/test/Makefile
+++ b/mods/test/Makefile
@@ -1,4 +1,7 @@
-gcc -c -fPIC -I../../lib test.c -o test.o
-gcc test.o -shared test.so
-mv test.so ..
-rm test.o
\ No newline at end of file
+CC=gcc
+CFLAGS=-fPIC -I../../lib
+OBJ=../test.so
+
+main:
+	$(CC) -shared -o $(OBJ) $(CFLAGS) ./test.c
+	@echo "All Done!"
\ No newline at end of file
diff --git a/mods/test/build.sh b/mods/test/build.sh
deleted file mode 100755
index e69de29..0000000
diff --git a/mods/test/test.c b/mods/test/test.c
index 1184ad1..7199325 100644
--- a/mods/test/test.c
+++ b/mods/test/test.c
@@ -1,17 +1,14 @@
 #include "irc.h"
 #include "events.h"
+#include "module.h"
 #include <stdio.h>
 #include <stdlib.h>
 
 void hello(struct irc_conn *bot, char *user, char *chan, char *text)
 {
-	printf("hi\n");
-
 	char *buf = (char *)malloc(sizeof(char *) * 500);
 	sprintf(buf, "hi %s", bot->nick);
 
-	printf("trigger: %s\n", buf);
-
 	if (!strcmp(text, buf))
 	{
 		irc_privmsg(bot, chan, "hi %s", user);
@@ -20,7 +17,7 @@ void hello(struct irc_conn *bot, char *user, char *chan, char *text)
 	free(buf);
 }
 
-void mod_init(struct irc_conn *b, char *where)
+void mod_init(void *handle, void (*export)())
 {
-	add_handler(PRIVMSG_CHAN, hello);
+	export(handle, PRIVMSG_CHAN, "hello");
 }
\ No newline at end of file
diff --git a/src/events.c b/src/events.c
index 2547201..5bf7054 100644
--- a/src/events.c
+++ b/src/events.c
@@ -58,20 +58,21 @@ void handle_chan_privmsg(struct irc_conn *bot, char *user, char *chan, char *tex
 	for (int i = 0; i < privmsg_chan.count; i++)
 	{
 		handler = privmsg_chan.handlers[i];
-		((void(*)())handler)(bot, user, chan, text);
+		(*handler)(bot, user, chan, text);
 	}
 }
 
 void handle_self_privmsg(struct irc_conn *bot, char *user, char *text)
 {
 	void (*handler)();
+	int i;
 	char *cmd, *arg, *modpath;
 	cmd = text;
 	arg = skip(cmd, ' ');
 
 	modpath = (char *)malloc(sizeof(char)*500);
 
-	for (int i = 0; i < privmsg_self.count; i++)
+	for (i = 0; i < privmsg_self.count; i++)
 	{
 		handler = privmsg_self.handlers[i];
 		((void(*)())handler)(bot, user, text);
@@ -89,6 +90,22 @@ void handle_self_privmsg(struct irc_conn *bot, char *user, char *text)
 		}
 	}
 
+	if (!strcmp("PRINT_HANDLERS", cmd))
+	{
+		if (strcmp(bot->admin, user))
+		{
+			for (i = 0; i < privmsg_chan.count; i++)
+			{
+				irc_notice(bot, user, "handler[%i:%i]: %p", i, privmsg_chan.type, privmsg_chan.handlers[i]);
+			}
+
+			for (i = 0; i < privmsg_self.count; i++)
+			{
+				irc_notice(bot, user, "handler[%i:%i]: %p", i, privmsg_self.type, privmsg_self.handlers[i]);
+			}
+		}
+	}
+
 	if (!strcmp("LOADMOD", cmd))
 	{
 		if (strcmp(bot->admin, user))
diff --git a/src/main.c b/src/main.c
index c1a73c6..c05a2b1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -13,12 +13,6 @@
 #include "events.h"
 
 
-void hello_cmd(struct irc_conn *bot, char *user, char *text)
-{
-	printf("cmd exec\n");
-	irc_notice(bot, user, "Hello");
-}
-
 int main()
 {
 	fd_set rd;
diff --git a/src/module.c b/src/module.c
index 99dd6e2..8dd1421 100644
--- a/src/module.c
+++ b/src/module.c
@@ -5,14 +5,22 @@
 #include <stdlib.h>
 #include <dlfcn.h>
 
+void export_handler(void *handle, int stype, char *hname)
+{
+	void (*handler)(struct irc_conn *bot, char *user, char *chan, char *text);
+
+	*(void **)(&handler) = dlsym(handle, hname);
+	add_handler(stype, handler);
+}
+
 void load_module(struct irc_conn *bot, char *where, int stype, char *file)
 {
 	void *handle;
-	void (*mod_init)(struct irc_conn *bot, char *where, void (*ah)());
+	void (*mod_init)(void *handle, void (*export)());
 	char *error = (char *)malloc(sizeof(char *)*1024);
 
 
-	handle = dlopen(file, RTLD_NOW | RTLD_GLOBAL);
+	handle = dlopen(file, RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE);
 	if (!handle)
 	{
 		sprintf(error, "Error: %s", dlerror());
@@ -47,7 +55,7 @@ void load_module(struct irc_conn *bot, char *where, int stype, char *file)
 		}
 	}
 
-	(*mod_init)(bot, where);
+	(*mod_init)(handle, export_handler);
 
 	dlclose(handle);