X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/81af5bcb394280ff1af82486961d852b102b923b..25f673bfde1c316aa0c5af551f6c0aa601b53e51:/modules/m_encap.c

diff --git a/modules/m_encap.c b/modules/m_encap.c
index 742c35d7..f87ed655 100644
--- a/modules/m_encap.c
+++ b/modules/m_encap.c
@@ -25,16 +25,13 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id: m_encap.c 254 2005-09-21 23:35:12Z nenolod $
  */
 
 #include "stdinc.h"
 #include "send.h"
 #include "channel.h"
 #include "client.h"
-#include "common.h"
-#include "config.h"
+#include "defaults.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"
@@ -42,18 +39,20 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "sprintf_irc.h"
 
-static int ms_encap(struct Client *client_p, struct Client *source_p,
-		     int parc, const char *parv[]);
+static const char encap_desc[] = "Provides the TS6 ENCAP facility";
+
+static void ms_encap(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
+		int parc, const char *parv[]);
 
 struct Message encap_msgtab = {
-	"ENCAP", 0, 0, 0, MFLG_SLOW,
+	"ENCAP", 0, 0, 0, 0,
 	{mg_ignore, mg_ignore, {ms_encap, 3}, {ms_encap, 3}, mg_ignore, mg_ignore}
 };
 
 mapi_clist_av1 encap_clist[] = { &encap_msgtab, NULL };
-DECLARE_MODULE_AV1(encap, NULL, NULL, encap_clist, NULL, NULL, "$Revision: 254 $");
+
+DECLARE_MODULE_AV2(encap, NULL, NULL, encap_clist, NULL, NULL, NULL, NULL, encap_desc);
 
 /* ms_encap()
  *
@@ -61,8 +60,8 @@ DECLARE_MODULE_AV1(encap, NULL, NULL, encap_clist, NULL, NULL, "$Revision: 254 $
  * parv[2] - subcommand
  * parv[3] - parameters
  */
-static int
-ms_encap(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+ms_encap(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	char buffer[BUFSIZE];
 	char *ptr;
@@ -71,16 +70,16 @@ ms_encap(struct Client *client_p, struct Client *source_p, int parc, const char
 	int i;
 
 	ptr = buffer;
-	
+
 	for(i = 1; i < parc - 1; i++)
 	{
 		len = strlen(parv[i]) + 1;
 
 		/* ugh, not even at the last parameter, just bail --fl */
 		if((size_t)(cur_len + len) >= sizeof(buffer))
-			return 0;
+			return;
 
-		rb_snprintf(ptr, sizeof(buffer) - cur_len, "%s ", parv[i]);
+		snprintf(ptr, sizeof(buffer) - cur_len, "%s ", parv[i]);
 		cur_len += len;
 		ptr += len;
 	}
@@ -89,9 +88,9 @@ ms_encap(struct Client *client_p, struct Client *source_p, int parc, const char
 
 	/* if its a command without parameters, dont prepend a ':' */
 	if(parc == 3)
-		rb_snprintf(ptr, sizeof(buffer) - cur_len, "%s", parv[2]);
+		snprintf(ptr, sizeof(buffer) - cur_len, "%s", parv[2]);
 	else
-		rb_snprintf(ptr, sizeof(buffer) - cur_len, ":%s", parv[parc-1]);
+		snprintf(ptr, sizeof(buffer) - cur_len, ":%s", parv[parc-1]);
 
 	/* add a trailing \0 if it was too long */
 	if((cur_len + len) >= BUFSIZE)
@@ -102,9 +101,5 @@ ms_encap(struct Client *client_p, struct Client *source_p, int parc, const char
 
 	/* if it matches us, find a matching handler and call it */
 	if(match(parv[1], me.name))
-		handle_encap(client_p, source_p, parv[2], parc - 2, parv + 2);
-
-	return 0;
+		handle_encap(msgbuf_p, client_p, source_p, parv[2], parc - 2, parv + 2);
 }
-
-