in_port_t * portp)
{
int s, retries;
- socklen_t len;
- struct sockaddr_storage name;
+ socklen_t_equiv len;
+ sockaddr_union name;
int save_errno;
int *portrange;
+ int sndbufsize = MAX_DGRAM;
portrange = getconf_intrange(CNF_RESERVED_UDP_PORT);
*portp = (in_port_t)0;
+ g_debug("dgram_bind: setting up a socket with family %d", family);
if((s = socket(family, SOCK_DGRAM, 0)) == -1) {
save_errno = errno;
dbprintf(_("dgram_bind: socket() failed: %s\n"),
return -1;
}
- SS_INIT(&name, family);
- SS_SET_INADDR_ANY(&name);
+ /* try setting the buffer size (= maximum allowable UDP packet size) */
+ if (setsockopt(s, SOL_SOCKET, SO_SNDBUF,
+ (void *) &sndbufsize, sizeof(sndbufsize)) < 0) {
+ dbprintf("dgram_bind: could not set udp send buffer to %d: %s (ignored)\n",
+ sndbufsize, strerror(errno));
+ }
+
+ SU_INIT(&name, family);
+ SU_SET_INADDR_ANY(&name);
/*
* If a port range was specified, we try to get a port in that
out:
/* find out what name was actually used */
- len = (socklen_t)sizeof(name);
+ len = (socklen_t_equiv)sizeof(name);
if(getsockname(s, (struct sockaddr *)&name, &len) == -1) {
save_errno = errno;
dbprintf(_("dgram_bind: getsockname() failed: %s\n"), strerror(save_errno));
aclose(s);
return -1;
}
- *portp = SS_GET_PORT(&name);
+ *portp = SU_GET_PORT(&name);
dgram->socket = s;
dbprintf(_("dgram_bind: socket %d bound to %s\n"),
int
dgram_send_addr(
- struct sockaddr_storage *addr,
+ sockaddr_union *addr,
dgram_t * dgram)
{
int s, rc;
s = dgram->socket;
socket_opened = 0;
} else {
- if((s = socket(addr->ss_family, SOCK_DGRAM, 0)) == -1) {
+ int sndbufsize = MAX_DGRAM;
+
+ g_debug("dgram_send_addr: setting up a socket with family %d", SU_GET_FAMILY(addr));
+ if((s = socket(SU_GET_FAMILY(addr), SOCK_DGRAM, 0)) == -1) {
save_errno = errno;
dbprintf(_("dgram_send_addr: socket() failed: %s\n"),
strerror(save_errno));
socket_opened = 1;
#ifdef USE_REUSEADDR
r = setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
- (void *)&on, (socklen_t)sizeof(on));
+ (void *)&on, (socklen_t_equiv)sizeof(on));
if (r < 0) {
dbprintf(_("dgram_send_addr: setsockopt(SO_REUSEADDR) failed: %s\n"),
strerror(errno));
}
#endif
+
+ /* try setting the buffer size (= maximum allowable UDP packet size) */
+ if (setsockopt(s, SOL_SOCKET, SO_SNDBUF,
+ (void *) &sndbufsize, sizeof(sndbufsize)) < 0) {
+ dbprintf("dgram_send_addr: could not set udp send buffer to %d: %s (ignored)\n",
+ sndbufsize, strerror(errno));
+ }
}
if(s < 0 || s >= (int)FD_SETSIZE) {
dgram_recv(
dgram_t * dgram,
int timeout,
- struct sockaddr_storage *fromaddr)
+ sockaddr_union *fromaddr)
{
SELECT_ARG_TYPE ready;
struct timeval to;
ssize_t size;
int sock;
- socklen_t addrlen;
+ socklen_t_equiv addrlen;
ssize_t nfound;
int save_errno;
return nfound;
}
- addrlen = (socklen_t)sizeof(struct sockaddr_storage);
+ addrlen = (socklen_t_equiv)sizeof(sockaddr_union);
size = recvfrom(sock, dgram->data, (size_t)MAX_DGRAM, 0,
(struct sockaddr *)fromaddr, &addrlen);
if(size == -1) {