Browse Source

test

release/v0.1
jl777 9 years ago
parent
commit
247d040e81
  1. 2
      iguana/iguana_init.c
  2. 8
      iguana/iguana_peers.c

2
iguana/iguana_init.c

@ -210,7 +210,7 @@ void iguana_parseline(struct iguana_info *coin,int32_t iter,FILE *fp)
//printf("parse line.(%s) maxpeers.%d\n",line,coin->MAXPEERS); //printf("parse line.(%s) maxpeers.%d\n",line,coin->MAXPEERS);
if ( iter == 0 ) if ( iter == 0 )
{ {
if ( m < (2*coin->MAXPEERS)/3 )//&& m < 77.7 ) if ( m < 7 )//(2*coin->MAXPEERS)/3 )//&& m < 77.7 )
{ {
if ( 0 && m == 0 ) if ( 0 && m == 0 )
{ {

8
iguana/iguana_peers.c

@ -402,14 +402,14 @@ int32_t iguana_queue_send(struct iguana_info *coin,struct iguana_peer *addr,int3
return(datalen); return(datalen);
} }
int32_t iguana_recv(int32_t usock,uint8_t *recvbuf,int32_t len) int32_t iguana_recv(char *ipaddr,int32_t usock,uint8_t *recvbuf,int32_t len)
{ {
int32_t recvlen,remains = len; int32_t recvlen,remains = len;
while ( remains > 0 ) while ( remains > 0 )
{ {
if ( (recvlen= (int32_t)recv(usock,recvbuf,remains,0)) < 0 ) if ( (recvlen= (int32_t)recv(usock,recvbuf,remains,0)) < 0 )
{ {
printf("recv errno.%d %s\n",errno,strerror(errno)); printf("%s recv errno.%d %s\n",ipaddr,errno,strerror(errno));
if ( errno == EAGAIN ) if ( errno == EAGAIN )
{ {
#ifdef IGUANA_DEDICATED_THREADS #ifdef IGUANA_DEDICATED_THREADS
@ -474,7 +474,7 @@ void _iguana_processmsg(struct iguana_info *coin,int32_t usock,struct iguana_pee
if ( coin->peers.shuttingdown != 0 || addr->dead != 0 ) if ( coin->peers.shuttingdown != 0 || addr->dead != 0 )
return; return;
memset(&H,0,sizeof(H)); memset(&H,0,sizeof(H));
if ( (recvlen= (int32_t)iguana_recv(usock,(uint8_t *)&H,sizeof(H))) == sizeof(H) ) if ( (recvlen= (int32_t)iguana_recv(addr->ipaddr,usock,(uint8_t *)&H,sizeof(H))) == sizeof(H) )
{ {
//printf("%p got.(%s) recvlen.%d from %s | usock.%d ready.%u dead.%u\n",addr,H.command,recvlen,addr->ipaddr,addr->usock,addr->ready,addr->dead); //printf("%p got.(%s) recvlen.%d from %s | usock.%d ready.%u dead.%u\n",addr,H.command,recvlen,addr->ipaddr,addr->usock,addr->ready,addr->dead);
if ( coin->peers.shuttingdown != 0 || addr->dead != 0 ) if ( coin->peers.shuttingdown != 0 || addr->dead != 0 )
@ -490,7 +490,7 @@ void _iguana_processmsg(struct iguana_info *coin,int32_t usock,struct iguana_pee
} }
if ( len > maxlen ) if ( len > maxlen )
buf = mycalloc('p',1,len); buf = mycalloc('p',1,len);
if ( (recvlen= iguana_recv(usock,buf,len)) < 0 ) if ( (recvlen= iguana_recv(addr->ipaddr,usock,buf,len)) < 0 )
{ {
printf("recv error on (%s) len.%d errno.%d (%s)\n",H.command,len,-recvlen,strerror(-recvlen)); printf("recv error on (%s) len.%d errno.%d (%s)\n",H.command,len,-recvlen,strerror(-recvlen));
if ( buf != _buf ) if ( buf != _buf )

Loading…
Cancel
Save