lukechilds
/
SuperNET
mirror of https://github.com/lukechilds/SuperNET.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Test

etomic
jl777 8 years ago
parent
dff29527c3
commit
2cc4fdb7dc
1 changed files with 23 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 41
      iguana/exchanges/LP_network.c

41
iguana/exchanges/LP_network.c
View File

@ -155,29 +155,35 @@ void LP_psockloop(void *_ptr)
} }
} }
n++; n++;
//if ( ptr->ispaired != 0 ) if ( iter == 0 )
{ {
if ( iter == 0 ) pfds[n].fd = ptr->sendsock;
pfds[n].events = POLLIN;
}
else
{
if ( pfds[n].fd != ptr->sendsock )
{ {
pfds[n].fd = ptr->sendsock; printf("unexpected fd.%d mismatched sendsock.%d\n",pfds[n].fd,ptr->sendsock);
pfds[n].events = POLLIN; break;
} }
else else if ( (pfds[n].revents & POLLIN) != 0 )
{ {
if ( pfds[n].fd != ptr->sendsock ) printf("%s paired has pollin\n",ptr->sendaddr);
if ( (size= nn_recv(ptr->sendsock,&buf,NN_MSG,0)) > 0 )
{ {
printf("unexpected fd.%d mismatched sendsock.%d\n",pfds[n].fd,ptr->sendsock); ptr->lasttime = now;
break; if ( ptr->ispaired != 0 )
}
else if ( (pfds[n].revents & POLLIN) != 0 )
{
printf("%s paired has pollin\n",ptr->sendaddr);
if ( (size= nn_recv(ptr->sendsock,&buf,NN_MSG,0)) > 0 )
{ {
ptr->lasttime = now;
sendsock = ptr->recvsock; sendsock = ptr->recvsock;
break; break;
} }
else
{
nn_freemsg(buf);
buf = 0;
size = 0;
}
} }
} }
n++; n++;
@ -292,13 +298,13 @@ char *LP_psock(char *myipaddr,int32_t ispaired)
{ {
if ( nn_bind(pullsock,pushaddr) >= 0 && nn_bind(pubsock,subaddr) >= 0 ) if ( nn_bind(pullsock,pushaddr) >= 0 && nn_bind(pubsock,subaddr) >= 0 )
{ {
timeout = 10; timeout = 1;
nn_setsockopt(pubsock,NN_SOL_SOCKET,NN_SNDTIMEO,&timeout,sizeof(timeout)); nn_setsockopt(pubsock,NN_SOL_SOCKET,NN_SNDTIMEO,&timeout,sizeof(timeout));
timeout = 1; timeout = 1;
nn_setsockopt(pullsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout)); nn_setsockopt(pullsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout));
maxsize = 1024 * 1024; maxsize = 1024 * 1024;
nn_setsockopt(pullsock,NN_SOL_SOCKET,NN_RCVBUF,&maxsize,sizeof(maxsize)); nn_setsockopt(pullsock,NN_SOL_SOCKET,NN_RCVBUF,&maxsize,sizeof(maxsize));
if ( ispaired != 0 ) //if ( ispaired != 0 )
{ {
nn_setsockopt(pullsock,NN_SOL_SOCKET,NN_SNDTIMEO,&timeout,sizeof(timeout)); nn_setsockopt(pullsock,NN_SOL_SOCKET,NN_SNDTIMEO,&timeout,sizeof(timeout));
nn_setsockopt(pubsock,NN_SOL_SOCKET,NN_RCVBUF,&maxsize,sizeof(maxsize)); nn_setsockopt(pubsock,NN_SOL_SOCKET,NN_RCVBUF,&maxsize,sizeof(maxsize));
@ -378,8 +384,7 @@ int32_t LP_initpublicaddr(uint16_t *mypullportp,char *publicaddr,char *myipaddr,
if ( LP_canbind != 0 ) if ( LP_canbind != 0 )
nntype = LP_COMMAND_RECVSOCK; nntype = LP_COMMAND_RECVSOCK;
else nntype = NN_PAIR;//NN_SUB; else nntype = NN_PAIR;//NN_SUB;
} } else nntype = NN_PAIR;
else nntype = NN_PAIR;
if ( LP_canbind != 0 ) if ( LP_canbind != 0 )
{ {
nanomsg_transportname(0,publicaddr,myipaddr,mypullport); nanomsg_transportname(0,publicaddr,myipaddr,mypullport);

Write Preview
Loading…
Cancel
Save