projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into aac
[paraslash.git]
/
recv.c
diff --git
a/recv.c
b/recv.c
index 31c18a31eab3c8c7d79b50f5d59840bfcf0e9ece..af15eb07efb005f8b959e764d74b1bf2a27db60d 100644
(file)
--- a/
recv.c
+++ b/
recv.c
@@
-19,13
+19,14
@@
#include "recv.h"
#include "recv.cmdline.h"
#include "recv.h"
#include "recv.cmdline.h"
+#include "fd.h"
#include "error.h"
struct gengetopt_args_info conf;
INIT_RECV_ERRLISTS;
#include "error.h"
struct gengetopt_args_info conf;
INIT_RECV_ERRLISTS;
-__printf_2_3 void para_log(int ll, char* fmt,...)
+__printf_2_3 void para_log(int ll, c
onst c
har* fmt,...)
{
va_list argp;
{
va_list argp;
@@
-47,7
+48,8
@@
static void *parse_config(int argc, char *argv[], int *receiver_num)
printf("available receivers: ");
for (i = 0; receivers[i].name; i++)
printf("%s%s", i? " " : "", receivers[i].name);
printf("available receivers: ");
for (i = 0; receivers[i].name; i++)
printf("%s%s", i? " " : "", receivers[i].name);
- printf("\nTry para_recv -r<receivername>:-h for help on <receivername>\n");
+ printf("\nTry\n\tpara_recv -r '<receivername> -h'\n"
+ "for help on <receivername>.\n");
exit(EXIT_SUCCESS);
}
return check_receiver_arg(conf.receiver_arg, receiver_num);
exit(EXIT_SUCCESS);
}
return check_receiver_arg(conf.receiver_arg, receiver_num);
@@
-80,16
+82,14
@@
recv:
FD_ZERO(&rfds);
FD_ZERO(&wfds);
timeout.tv_sec = 0;
FD_ZERO(&rfds);
FD_ZERO(&wfds);
timeout.tv_sec = 0;
- timeout.tv_usec =
1000
* 1000;
+ timeout.tv_usec =
999
* 1000;
max = -1;
ret = r->pre_select(&rn, &rfds, &wfds, &timeout);
max = -1;
ret = r->pre_select(&rn, &rfds, &wfds, &timeout);
- max = MAX(max, ret);
+ max =
PARA_
MAX(max, ret);
- PARA_DEBUG_LOG("timeout: %lums
\n", tv2ms(&timeout)
);
- ret =
select(max + 1, &rfds, &wfds, NULL
, &timeout);
+ PARA_DEBUG_LOG("timeout: %lums
, max: %d\n", tv2ms(&timeout), max
);
+ ret =
para_select(max + 1, &rfds, &wfds
, &timeout);
if (ret < 0) {
if (ret < 0) {
- if (errno == EINTR || errno == EAGAIN)
- goto recv;
ret = -E_RECV_SELECT;
goto out;
}
ret = -E_RECV_SELECT;
goto out;
}
@@
-122,6
+122,6
@@
out:
if (r)
r->shutdown();
if (ret < 0)
if (r)
r->shutdown();
if (ret < 0)
- PARA_
NOTICE_LOG("%d: (%s)\n", ret
, PARA_STRERROR(-ret));
+ PARA_
ERROR_LOG("%s\n"
, PARA_STRERROR(-ret));
return ret;
}
return ret;
}