projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 2.5.1p1
[debian/amanda]
/
common-src
/
dgram.c
diff --git
a/common-src/dgram.c
b/common-src/dgram.c
index 5df3a57a92aead45fef282039b4eec5fbff8a6c4..2008fc999f139afedee8f979f44c624eb872cee9 100644
(file)
--- a/
common-src/dgram.c
+++ b/
common-src/dgram.c
@@
-25,7
+25,7
@@
* University of Maryland at College Park
*/
/*
* University of Maryland at College Park
*/
/*
- * $Id: dgram.c,v 1.32
2006/07/05 19:54:20
martinea Exp $
+ * $Id: dgram.c,v 1.32
.2.3 2006/09/20 12:48:54
martinea Exp $
*
* library routines to marshall/send, recv/unmarshall UDP packets
*/
*
* library routines to marshall/send, recv/unmarshall UDP packets
*/
@@
-57,10
+57,6
@@
dgram_bind(
socklen_t len;
struct sockaddr_in name;
int save_errno;
socklen_t len;
struct sockaddr_in name;
int save_errno;
-#if defined(USE_REUSEADDR)
- const int on = 1;
- int r;
-#endif
*portp = (in_port_t)0;
if((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) {
*portp = (in_port_t)0;
if((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) {
@@
-84,16
+80,6
@@
dgram_bind(
name.sin_family = (sa_family_t)AF_INET;
name.sin_addr.s_addr = INADDR_ANY;
name.sin_family = (sa_family_t)AF_INET;
name.sin_addr.s_addr = INADDR_ANY;
-#ifdef USE_REUSEADDR
- r = setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
- (void *)&on, (socklen_t)sizeof(on));
- if (r < 0) {
- dbprintf(("%s: dgram_bind: setsockopt(SO_REUSEADDR) failed: %s\n",
- debug_prefix(NULL),
- strerror(errno)));
- }
-#endif
-
/*
* If a port range was specified, we try to get a port in that
* range first. Next, we try to get a reserved port. If that
/*
* If a port range was specified, we try to get a port in that
* range first. Next, we try to get a reserved port. If that
@@
-331,8
+317,7
@@
dgram_recv(
to.tv_usec = 0;
dbprintf(("%s: dgram_recv(dgram=%p, timeout=%u, fromaddr=%p)\n",
to.tv_usec = 0;
dbprintf(("%s: dgram_recv(dgram=%p, timeout=%u, fromaddr=%p)\n",
- debug_prefix_time(NULL), timeout, fromaddr));
- dump_sockaddr(fromaddr);
+ debug_prefix_time(NULL), dgram, timeout, fromaddr));
nfound = (ssize_t)select(sock+1, &ready, NULL, NULL, &to);
if(nfound <= 0 || !FD_ISSET(sock, &ready)) {
nfound = (ssize_t)select(sock+1, &ready, NULL, NULL, &to);
if(nfound <= 0 || !FD_ISSET(sock, &ready)) {
@@
-376,6
+361,7
@@
dgram_recv(
errno = save_errno;
return -1;
}
errno = save_errno;
return -1;
}
+ dump_sockaddr(fromaddr);
dgram->len = (size_t)size;
dgram->data[size] = '\0';
dgram->cur = dgram->data;
dgram->len = (size_t)size;
dgram->data[size] = '\0';
dgram->cur = dgram->data;