Add support for registering a printf() callback

for debug output. This is required by Firefox.
sctplab · Jan 19, 2013 · b724b61 · b724b61
1 parent 9ce774c
commit b724b61
Show file tree

Hide file tree

Showing 16 changed files with 152 additions and 34 deletions.
diff --git a/programs/client.c b/programs/client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2012 Michael Tuexen
+ * Copyright (C) 2011-2013 Michael Tuexen
  *
  * All rights reserved.
  *
@@ -35,6 +35,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdarg.h>
 #ifndef _WIN32
 #include <unistd.h>
 #endif
@@ -74,6 +75,16 @@ receive_cb(struct socket *sock, union sctp_sockstore addr, void *data,
 	return 1;
 }
 
+void
+debug_printf(const char *format, ...)
+{
+	va_list ap;
+
+	va_start(ap, format);
+	vprintf(format, ap);
+	va_end(ap);
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -86,9 +97,9 @@ main(int argc, char *argv[])
 	int i, n;
 
 	if (argc > 3) {
-		usrsctp_init(atoi(argv[3]), NULL);
+		usrsctp_init(atoi(argv[3]), NULL, debug_printf);
 	} else {
-		usrsctp_init(9899, NULL);
+		usrsctp_init(9899, NULL, debug_printf);
 	}
 #ifdef SCTP_DEBUG
 	usrsctp_sysctl_set_sctp_debug_on(SCTP_DEBUG_NONE);

diff --git a/programs/datachan_serv.c b/programs/datachan_serv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Michael Tuexen
+ * Copyright (C) 2012-2013 Michael Tuexen
  *
  * All rights reserved.
  *
@@ -38,6 +38,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdarg.h>
 #include <sys/types.h>
 #ifndef _WIN32
 #include <unistd.h>
@@ -267,6 +268,15 @@ receive_cb(struct socket *sock, union sctp_sockstore addr, void *data,
 	return 1;
 }
 
+void
+debug_printf(const char *format, ...)
+{
+	va_list ap;
+
+	va_start(ap, format);
+	vprintf(format, ap);
+	va_end(ap);
+}
 
 int
 main(int argc, char *argv[])
@@ -291,9 +301,9 @@ main(int argc, char *argv[])
   }
 
   if (argc > 1) {
-		usrsctp_init(atoi(argv[1]), NULL);
+		usrsctp_init(atoi(argv[1]), NULL, debug_printf);
 	} else {
-		usrsctp_init(9899, NULL);
+		usrsctp_init(9899, NULL, debug_printf);
 	}
 #ifdef SCTP_DEBUG
 	usrsctp_sysctl_set_sctp_debug_on(SCTP_DEBUG_NONE);

diff --git a/programs/daytime_server.c b/programs/daytime_server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Michael Tuexen
+ * Copyright (C) 2012-2013 Michael Tuexen
  *
  * All rights reserved.
  *
@@ -38,6 +38,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdarg.h>
 #include <sys/types.h>
 #include <time.h>
 #ifndef _WIN32
@@ -48,6 +49,16 @@
 #endif
 #include <usrsctp.h>
 
+void
+debug_printf(const char *format, ...)
+{
+	va_list ap;
+
+	va_start(ap, format);
+	vprintf(format, ap);
+	va_end(ap);
+}
+
 #define DAYTIME_PPID 40
 int
 main(int argc, char *argv[])
@@ -61,9 +72,9 @@ main(int argc, char *argv[])
 	struct sctp_sndinfo sndinfo;
 
 	if (argc > 1) {
-		usrsctp_init(atoi(argv[1]), NULL);
+		usrsctp_init(atoi(argv[1]), NULL, debug_printf);
 	} else {
-		usrsctp_init(9899, NULL);
+		usrsctp_init(9899, NULL, debug_printf);
 	}
 #ifdef SCTP_DEBUG
 	usrsctp_sysctl_set_sctp_debug_on(SCTP_DEBUG_NONE);

diff --git a/programs/discard_server.c b/programs/discard_server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2012 Michael Tuexen
+ * Copyright (C) 2011-2013 Michael Tuexen
  *
  * All rights reserved.
  *
@@ -38,6 +38,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdarg.h>
 #include <sys/types.h>
 #ifndef _WIN32
 #include <unistd.h>
@@ -105,6 +106,16 @@ receive_cb(struct socket *sock, union sctp_sockstore addr, void *data,
 	return 1;
 }
 
+void
+debug_printf(const char *format, ...)
+{
+	va_list ap;
+
+	va_start(ap, format);
+	vprintf(format, ap);
+	va_end(ap);
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -131,9 +142,9 @@ main(int argc, char *argv[])
 	unsigned int infotype;
 
 	if (argc > 1) {
-		usrsctp_init(atoi(argv[1]), NULL);
+		usrsctp_init(atoi(argv[1]), NULL, debug_printf);
 	} else {
-		usrsctp_init(9899, NULL);
+		usrsctp_init(9899, NULL, debug_printf);
 	}
 #ifdef SCTP_DEBUG
 	usrsctp_sysctl_set_sctp_debug_on(SCTP_DEBUG_NONE);

diff --git a/programs/ekr_client.c b/programs/ekr_client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2012 Michael Tuexen
+ * Copyright (C) 2011-2013 Michael Tuexen
  *
  * All rights reserved.
  *
@@ -34,6 +34,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdarg.h>
 #include <sys/types.h>
 #ifndef _WIN32
 #include <sys/socket.h>
@@ -141,6 +142,16 @@ receive_cb(struct socket *sock, union sctp_sockstore addr, void *data,
 	return 1;
 }
 
+void
+debug_printf(const char *format, ...)
+{
+	va_list ap;
+
+	va_start(ap, format);
+	vprintf(format, ap);
+	va_end(ap);
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -161,7 +172,7 @@ main(int argc, char *argv[])
 	struct sctp_sndinfo sndinfo;
 	char buffer[BUFFER_SIZE];
 
-	usrsctp_init(0, conn_output);
+	usrsctp_init(0, conn_output, debug_printf);
 	/* set up a connected UDP socket */
 #ifdef _WIN32
 	if ((fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == INVALID_SOCKET) {

diff --git a/programs/ekr_loop.c b/programs/ekr_loop.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2012 Michael Tuexen
+ * Copyright (C) 2011-2013 Michael Tuexen
  *
  * All rights reserved.
  *
@@ -31,6 +31,7 @@
 #ifdef _WIN32
 #define _CRT_SECURE_NO_WARNINGS
 #endif
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -139,6 +140,16 @@ receive_cb(struct socket *sock, union sctp_sockstore addr, void *data,
 	return 1;
 }
 
+void
+debug_printf(const char *format, ...)
+{
+	va_list ap;
+
+	va_start(ap, format);
+	vprintf(format, ap);
+	va_end(ap);
+}
+
 int
 main(void)
 {
@@ -158,7 +169,7 @@ main(void)
 	struct sctp_sndinfo sndinfo;
 	char line[LINE_LENGTH];
 
-	usrsctp_init(0, conn_output);
+	usrsctp_init(0, conn_output, debug_printf);
 	/* set up a connected UDP socket */
 #ifdef _WIN32
 	if ((fd_c = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == INVALID_SOCKET) {

diff --git a/programs/ekr_peer.c b/programs/ekr_peer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2012 Michael Tuexen
+ * Copyright (C) 2011-2013 Michael Tuexen
  *
  * All rights reserved.
  *
@@ -31,9 +31,11 @@
 #ifdef _WIN32
 #define _CRT_SECURE_NO_WARNINGS
 #endif
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdarg.h>
 #include <sys/types.h>
 #ifndef _WIN32
 #include <sys/socket.h>
@@ -330,6 +332,16 @@ receive_cb(struct socket *sock, union sctp_sockstore addr, void *data,
 	return 1;
 }
 
+void
+debug_printf(const char *format, ...)
+{
+	va_list ap;
+
+	va_start(ap, format);
+	vprintf(format, ap);
+	va_end(ap);
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -354,7 +366,7 @@ main(int argc, char *argv[])
 	struct sctp_sndinfo sndinfo;
 	char line[LINE_LENGTH];
 
-	usrsctp_init(0, conn_output);
+	usrsctp_init(0, conn_output, debug_printf);
 	/* set up a connected UDP socket */
 #ifdef _WIN32
 	if ((fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == INVALID_SOCKET) {

diff --git a/programs/ekr_server.c b/programs/ekr_server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2012 Michael Tuexen
+ * Copyright (C) 2011-2013 Michael Tuexen
  *
  * All rights reserved.
  *
@@ -36,6 +36,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
+#include <stdarg.h>
 #ifndef _WIN32
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -142,6 +143,16 @@ receive_cb(struct socket *s, union sctp_sockstore addr, void *data,
 	return 1;
 }
 
+void
+debug_printf(const char *format, ...)
+{
+	va_list ap;
+
+	va_start(ap, format);
+	vprintf(format, ap);
+	va_end(ap);
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -159,7 +170,7 @@ main(int argc, char *argv[])
 	pthread_t tid;
 #endif
 
-	usrsctp_init(0, conn_output);
+	usrsctp_init(0, conn_output, debug_printf);
 	/* set up a connected UDP socket */
 #ifdef _WIN32
 	if ((fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == INVALID_SOCKET) {

diff --git a/programs/rtcweb.c b/programs/rtcweb.c
@@ -1,6 +1,6 @@
 /*-
- * Copyright (C) 2012 Michael Tuexen
- * Copyright (C) 2012 Irene Ruengeler
+ * Copyright (C) 2012-2013 Michael Tuexen
+ * Copyright (C) 2012-2013 Irene Ruengeler
  *
  * All rights reserved.
  *
@@ -50,6 +50,7 @@
 #include <unistd.h>
 #include <stdint.h>
 #endif
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -1285,6 +1286,16 @@ receive_cb(struct socket *sock, union sctp_sockstore addr, void *data,
 	return (1);
 }
 
+void
+debug_printf(const char *format, ...)
+{
+	va_list ap;
+
+	va_start(ap, format);
+	vprintf(format, ap);
+	va_end(ap);
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -1310,9 +1321,9 @@ main(int argc, char *argv[])
 	                          SCTP_STREAM_CHANGE_EVENT};
 
 	if (argc > 1) {
-		usrsctp_init(atoi(argv[1]), NULL);
+		usrsctp_init(atoi(argv[1]), NULL, debug_printf);
 	} else {
-		usrsctp_init(9899, NULL);
+		usrsctp_init(9899, NULL, debug_printf);
 	}
 #ifdef SCTP_DEBUG
 	usrsctp_sysctl_set_sctp_debug_on(SCTP_DEBUG_NONE);