From: Steve K. <st...@st...> - 2004-04-19 23:30:33
|
Thanks for making up the patches! Most of this looks OK (not too much, actually). I'll insert my questions below: John wrote: >------------------------------------------------------------------------ > >--- lib/Makefile.orig Mon Apr 19 13:39:00 2004 >+++ lib/Makefile Mon Apr 19 16:45:47 2004 > > > OK >------------------------------------------------------------------------ > >--- lib/libiax2/src/iax.c.orig Mon Apr 19 13:42:51 2004 >+++ lib/libiax2/src/iax.c Mon Apr 19 17:33:00 2004 >@@ -28,6 +28,11 @@ > #else > > #include <netdb.h> >+ >+#ifdef FREEBSD >+#include <sys/types.h> >+#endif >+ > #include <sys/socket.h> > #include <netinet/in.h> > #include <sys/time.h> >@@ -43,7 +48,7 @@ > #include <arpa/inet.h> > #include <time.h> > >-#ifndef MACOSX >+#ifdef MACOSX > > This looks like an error? Why are you reversing the MacOSX ifdef here? > #include <malloc.h> > #include <error.h> > #endif >@@ -71,7 +76,7 @@ > #ifdef WIN32 > #define IAX_SOCKOPTS 0 > #else >-#ifdef MACOSX >+#if defined(MACOSX) || defined(FREEBSD) > #define IAX_SOCKOPTS MSG_DONTWAIT > #else /* Linux and others */ > #define IAX_SOCKOPTS MSG_DONTWAIT | MSG_NOSIGNAL >@@ -2339,7 +2344,7 @@ > > static struct iax_event *iax_net_read(void) > { >- char buf[65536]; >+ char buf[32768]; > > I think that any size less than (65536 - sizeof the other local args) will be OK for you. In practice, we aren't likely to need more than about 256 bytes for audio; (160 samples of uLaw; for PCM the payload would be 320 bytes). But, for video or whatnot, the limit, I guess, is whatever the max UDP payload can be. > int res; > struct sockaddr_in sin; > int sinlen; > > >------------------------------------------------------------------------ > >--- simpleclient/iaxcomm/Makefile.orig Mon Apr 19 15:32:07 2004 >+++ simpleclient/iaxcomm/Makefile Mon Apr 19 17:24:23 2004 > > OK. |