From 1f2d8b3ecba615f1534bba784cb3f6ddc8c0a6fc Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 7 Jul 2017 19:04:41 +0300 Subject: [PATCH] Test --- iguana/exchanges/LP_commands.c | 13 +++++++------ iguana/exchanges/LP_network.c | 23 ++++++++++------------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/iguana/exchanges/LP_commands.c b/iguana/exchanges/LP_commands.c index f52b838db..9b93fcd41 100644 --- a/iguana/exchanges/LP_commands.c +++ b/iguana/exchanges/LP_commands.c @@ -242,14 +242,15 @@ trust(pubkey, trust)\n\ { if ( (reqjson= LP_dereference(argjson,"broadcast")) != 0 ) { - argjson = reqjson; - if ( jobj(argjson,"method2") != 0 ) + if ( jobj(reqjson,"method2") != 0 ) { - jdelete(argjson,"method"); - method = jstr(argjson,"method2"); - jaddstr(argjson,"method",method); - jdelete(argjson,"method2"); + jdelete(reqjson,"method"); + method = jstr(reqjson,"method2"); + jaddstr(reqjson,"method",method); + jdelete(reqjson,"method2"); + printf("BROADCASTED.(%s)\n",jprint(reqjson,0)); } + argjson = reqjson; } } if ( LP_isdisabled(base,rel) != 0 ) diff --git a/iguana/exchanges/LP_network.c b/iguana/exchanges/LP_network.c index d88d66555..18b0d277e 100644 --- a/iguana/exchanges/LP_network.c +++ b/iguana/exchanges/LP_network.c @@ -92,18 +92,15 @@ int32_t LP_Qenqueued,LP_Qdequeued; void _LP_sendqueueadd(uint32_t crc32,int32_t sock,uint8_t *msg,int32_t msglen,int32_t peerind) { struct LP_queue *ptr; - if ( LP_Qenqueued == 0 || IAMLP != 0 ) - { - ptr = calloc(1,sizeof(*ptr) + msglen); - ptr->crc32 = crc32; - ptr->sock = sock; - ptr->peerind = peerind; - ptr->msglen = msglen; - memcpy(ptr->msg,msg,msglen); - DL_APPEND(LP_Q,ptr); - LP_Qenqueued++; - //printf("Q.%p: peerind.%d msglen.%d\n",ptr,peerind,msglen); - } + ptr = calloc(1,sizeof(*ptr) + msglen); + ptr->crc32 = crc32; + ptr->sock = sock; + ptr->peerind = peerind; + ptr->msglen = msglen; + memcpy(ptr->msg,msg,msglen); + DL_APPEND(LP_Q,ptr); + LP_Qenqueued++; + //printf("Q.%p: peerind.%d msglen.%d\n",ptr,peerind,msglen); } void queue_loop(void *ignore) @@ -256,7 +253,7 @@ void LP_broadcast_message(int32_t pubsock,char *base,char *rel,bits256 destpub25 msg = (void *)jprint(argjson,0); msglen = (int32_t)strlen((char *)msg) + 1; crc32 = calc_crc32(0,&msg[2],msglen - 2); - printf("CRC32.%u (%s)\n",crc32,(char *)msg); + //printf("CRC32.%u (%s)\n",crc32,(char *)msg); //jdelete(argjson,"method"); //jaddstr(argjson,"method","broadcast"); //msg = (void *)jprint(argjson,0);