Browse Source

test

release/v0.1
jl777 9 years ago
parent
commit
936b64d132
  1. 1
      iguana/iguana_instantdex.c
  2. 10
      iguana/iguana_peers.c

1
iguana/iguana_instantdex.c

@ -361,6 +361,7 @@ char *instantdex_sendcmd(struct supernet_info *myinfo,struct instantdex_offer *o
//hexstr = malloc(msg->sig.allocsize*2 + 1); //hexstr = malloc(msg->sig.allocsize*2 + 1);
//init_hexbytes_noT(hexstr,(uint8_t *)msg,msg->sig.allocsize); //init_hexbytes_noT(hexstr,(uint8_t *)msg,msg->sig.allocsize);
//retstr = SuperNET_categorymulticast(myinfo,0,myinfo->instantdex_category,desthash,hexstr,0,hops,1,argjson,0); //retstr = SuperNET_categorymulticast(myinfo,0,myinfo->instantdex_category,desthash,hexstr,0,hops,1,argjson,0);
memset(serialized,0,sizeof(struct iguana_msghdr));
memcpy(&serialized[sizeof(struct iguana_msghdr)],(uint8_t *)msg,msg->sig.allocsize); memcpy(&serialized[sizeof(struct iguana_msghdr)],(uint8_t *)msg,msg->sig.allocsize);
if ( (coin= iguana_coinfind("BTCD")) != 0 && (max= coin->peers.numranked) > 0 ) if ( (coin= iguana_coinfind("BTCD")) != 0 && (max= coin->peers.numranked) > 0 )
{ {

10
iguana/iguana_peers.c

@ -458,6 +458,8 @@ int32_t iguana_send(struct iguana_info *coin,struct iguana_peer *addr,uint8_t *s
int32_t iguana_queue_send(struct iguana_info *coin,struct iguana_peer *addr,int32_t delay,uint8_t *serialized,char *cmd,int32_t len,int32_t getdatablock,int32_t forceflag) int32_t iguana_queue_send(struct iguana_info *coin,struct iguana_peer *addr,int32_t delay,uint8_t *serialized,char *cmd,int32_t len,int32_t getdatablock,int32_t forceflag)
{ {
struct iguana_packet *packet; int32_t datalen; struct iguana_packet *packet; int32_t datalen;
if ( (datalen= iguana_sethdr((void *)serialized,coin->chain->netmagic,cmd,&serialized[sizeof(struct iguana_msghdr)],len)) < 0 )
return(-1);
if ( addr == 0 ) if ( addr == 0 )
{ {
printf("iguana_queue_send null addr\n"); printf("iguana_queue_send null addr\n");
@ -465,10 +467,10 @@ int32_t iguana_queue_send(struct iguana_info *coin,struct iguana_peer *addr,int3
return(-1); return(-1);
} }
else if ( forceflag != 0 ) else if ( forceflag != 0 )
{
return(iguana_send(coin,addr,serialized,len)); return(iguana_send(coin,addr,serialized,len));
}
if ( (datalen= iguana_sethdr((void *)serialized,coin->chain->netmagic,cmd,&serialized[sizeof(struct iguana_msghdr)],len)) < 0 )
return(-1);
if ( strcmp("getaddr",cmd) == 0 && time(NULL) < addr->lastgotaddr+300 ) if ( strcmp("getaddr",cmd) == 0 && time(NULL) < addr->lastgotaddr+300 )
return(0); return(0);
//if ( strcmp("version",cmd) == 0 ) //if ( strcmp("version",cmd) == 0 )
@ -587,7 +589,9 @@ void _iguana_processmsg(struct iguana_info *coin,int32_t usock,struct iguana_pee
myfree(buf,len); myfree(buf,len);
return; return;
} }
printf("invalid header received from (%s)\n",addr->ipaddr); int32_t i; for (i=0; i<sizeof(H); i++)
printf("%02x",((uint8_t *)&H)[i]);
printf(" invalid header received from (%s)\n",addr->ipaddr);
addr->dead = 1; addr->dead = 1;
} }
// printf("%s recv error on hdr errno.%d (%s) -> zombify\n",addr->ipaddr,-recvlen,strerror(-recvlen)); // printf("%s recv error on hdr errno.%d (%s) -> zombify\n",addr->ipaddr,-recvlen,strerror(-recvlen));

Loading…
Cancel
Save