projects
/
my-code
/
ivac.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
only set reuseaddr socket opt if regular bind call fails
[my-code/ivac.git]
/
src
/
network.c
diff --git
a/src/network.c
b/src/network.c
index
3293a57
..
3579f5a
100644
(file)
--- a/
src/network.c
+++ b/
src/network.c
@@
-27,17
+27,15
@@
int network_init(t_net *net) {
addr.sin_port=htons(net->l_port);
addr.sin_addr.s_addr=INADDR_ANY;
addr.sin_port=htons(net->l_port);
addr.sin_addr.s_addr=INADDR_ANY;
- /* prevent addres in use error message */
- true=1;
- if(setsockopt(net->l_fd,SOL_SOCKET,SO_REUSEADDR,&true,sizeof(true))==-1) {
- perror("[network] setsockopt call");
- return N_ERROR;
- }
-
if(bind(net->l_fd,(struct sockaddr *)&addr,
sizeof(struct sockaddr))==-1) {
if(bind(net->l_fd,(struct sockaddr *)&addr,
sizeof(struct sockaddr))==-1) {
- perror("[network] bind call");
- return N_ERROR;
+ /* try harder ... */
+ true=1;
+ if(setsockopt(net->l_fd,SOL_SOCKET,SO_REUSEADDR,&true,sizeof(true))==-1) {
+ perror("[network] setsockopt call");
+ return N_ERROR;
+ }
+ puts("[network] reused address");
}
if(listen(net->l_fd,MAX_LISTEN_QUEUE)==-1) {
}
if(listen(net->l_fd,MAX_LISTEN_QUEUE)==-1) {
@@
-144,7
+142,7
@@
int network_connect(t_net *net,int channel) {
return N_E_IN_USE;
}
if(!(net->connection[channel].status&C_INFO_A)) {
return N_E_IN_USE;
}
if(!(net->connection[channel].status&C_INFO_A)) {
- printf("[network] connect failed, missing configuration for channel %02d",
+ printf("[network] connect failed, missing configuration for channel %02d
\n
",
channel);
return N_E_NO_INFO;
}
channel);
return N_E_NO_INFO;
}
@@
-157,7
+155,7
@@
int network_connect(t_net *net,int channel) {
int network_close(t_net *net,int channel) {
if(!(net->connection[channel].status&C_ESTABL)) {
int network_close(t_net *net,int channel) {
if(!(net->connection[channel].status&C_ESTABL)) {
- printf("[network] close failed, channel %02d not active",channel);
+ printf("[network] close failed, channel %02d not active
\n
",channel);
return N_E_NC;
}
return N_E_NC;
}