diff options
| author | Benny Prijono <bennylp@teluu.com> | 2010-01-14 09:05:08 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2010-01-14 09:05:08 +0000 |
| commit | 7d708af436ceda16e23daf2042033a9d5443a474 (patch) | |
| tree | 7fabfd5f9f959cbdfe087753c7aa742bf553b2c1 /pjsip | |
| parent | 708b962f108087a0823fadd01724604b58d34542 (diff) | |
Misc (#1026): remove the code that silently set SO_SNDBUF/SO_RCVBUF as it's not that useful and it would print error message on many platforms that don't support it, causing many questions from users
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3060 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip')
| -rw-r--r-- | pjsip/src/pjsip/sip_transport_udp.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/pjsip/src/pjsip/sip_transport_udp.c b/pjsip/src/pjsip/sip_transport_udp.c index 2ffe569f..24e22945 100644 --- a/pjsip/src/pjsip/sip_transport_udp.c +++ b/pjsip/src/pjsip/sip_transport_udp.c @@ -50,12 +50,19 @@ * * More experiments are needed probably. */ +/* 2010/01/14 + * Too many people complained about seeing "Error setting SNDBUF" log, + * so lets just remove this. People who want to have SNDBUF set can + * still do so by declaring these two macros in config_site.h + */ #ifndef PJSIP_UDP_SO_SNDBUF_SIZE -# define PJSIP_UDP_SO_SNDBUF_SIZE (24*1024*1024) +/*# define PJSIP_UDP_SO_SNDBUF_SIZE (24*1024*1024)*/ +# define PJSIP_UDP_SO_SNDBUF_SIZE 0 #endif #ifndef PJSIP_UDP_SO_RCVBUF_SIZE -# define PJSIP_UDP_SO_RCVBUF_SIZE (24*1024*1024) +/*# define PJSIP_UDP_SO_RCVBUF_SIZE (24*1024*1024)*/ +# define PJSIP_UDP_SO_RCVBUF_SIZE 0 #endif @@ -550,10 +557,13 @@ static void udp_set_socket(struct udp_transport *tp, pj_sock_t sock, const pjsip_host_port *a_name) { +#if PJSIP_UDP_SO_RCVBUF_SIZE || PJSIP_UDP_SO_SNDBUF_SIZE long sobuf_size; pj_status_t status; +#endif /* Adjust socket rcvbuf size */ +#if PJSIP_UDP_SO_RCVBUF_SIZE sobuf_size = PJSIP_UDP_SO_RCVBUF_SIZE; status = pj_sock_setsockopt(sock, pj_SOL_SOCKET(), pj_SO_RCVBUF(), &sobuf_size, sizeof(sobuf_size)); @@ -563,8 +573,10 @@ static void udp_set_socket(struct udp_transport *tp, PJ_LOG(4,(THIS_FILE, "Error setting SO_RCVBUF: %s [%d]", errmsg, status)); } +#endif /* Adjust socket sndbuf size */ +#if PJSIP_UDP_SO_SNDBUF_SIZE sobuf_size = PJSIP_UDP_SO_SNDBUF_SIZE; status = pj_sock_setsockopt(sock, pj_SOL_SOCKET(), pj_SO_SNDBUF(), &sobuf_size, sizeof(sobuf_size)); @@ -574,6 +586,7 @@ static void udp_set_socket(struct udp_transport *tp, PJ_LOG(4,(THIS_FILE, "Error setting SO_SNDBUF: %s [%d]", errmsg, status)); } +#endif /* Set the socket. */ tp->sock = sock; |