Browse Source

test

release/v0.1
jl777 9 years ago
parent
commit
3cd4062646
  1. 2
      iguana/SuperNET.c
  2. 2
      iguana/SuperNET_category.c
  3. 2
      iguana/pangea777.h
  4. 13
      iguana/pangea_api.c
  5. 2
      iguana/pangea_hand.c

2
iguana/SuperNET.c

@ -459,7 +459,7 @@ bits256 iguana_actualpubkey(int32_t *offsetp,uint8_t *cipher,int32_t cipherlen,b
int32_t iguana_send_supernet(struct iguana_info *coin,struct iguana_peer *addr,char *jsonstr,int32_t delaymillis)
{
int32_t datalen,cipherlen,qlen = -1; uint8_t *serialized,space2[8192],*cipher; cJSON *json;
int32_t datalen,cipherlen,qlen = -1; uint8_t *serialized,space2[32768],*cipher; cJSON *json;
struct supernet_info *myinfo; uint16_t checkc;
bits256 destpub,privkey,pubkey,nextprivkey,nextpubkey,nextdestpub; void *ptr = 0;
myinfo = SuperNET_MYINFO(0);

2
iguana/SuperNET_category.c

@ -168,7 +168,7 @@ char *SuperNET_categorymulticast(struct supernet_info *myinfo,int32_t surveyflag
//char str[65]; printf("multicast.(%s)\n",bits256_str(str,categoryhash));
if ( is_hexstr(message,len) == 0 )
{
hexmsg = malloc((len << 1) + 1);
hexmsg = malloc(((len+1) << 1) + 1);
init_hexbytes_noT(hexmsg,(uint8_t *)message,len+1);
} else hexmsg = message;
plaintext = category_plaintext(myinfo,categoryhash,subhash,plaintext);

2
iguana/pangea777.h

@ -96,7 +96,7 @@ struct table_info
struct player_info *active[CARDS777_MAXPLAYERS];
uint32_t numhands,summarysize,timestamp; int64_t hostrake,pangearake;
struct hand_info hand; int64_t snapshot[CARDS777_MAXPLAYERS];
uint8_t summary[65536],space[65536*2]; char spacestr[65536*4+1];
uint8_t summary[65536];
struct cards777_privdata priv;
};

13
iguana/pangea_api.c

@ -228,8 +228,8 @@ char *pangea_jsondatacmd(struct supernet_info *myinfo,bits256 tablehash,struct p
void pangea_sendcmd(struct supernet_info *myinfo,struct table_info *tp,char *cmdstr,int32_t destplayer,uint8_t *data,int32_t datalen,int32_t cardi,int32_t turni)
{
struct player_info *p; struct pangea_msghdr *pm; char *str;
pm = (void *)tp->space;
struct player_info *p; struct pangea_msghdr *pm; char *str,*hexstr;
pm = calloc(1,sizeof(*pm) + datalen);//(void *)tp->space;
memset(pm,0,sizeof(*pm));
strncpy(pm->cmd,cmdstr,8);
pm->turni = turni, pm->myind = tp->priv.myind, pm->cardi = cardi, pm->destplayer = destplayer;
@ -237,20 +237,23 @@ void pangea_sendcmd(struct supernet_info *myinfo,struct table_info *tp,char *cmd
pangea_rwdata(1,pm->serialized,datalen,data);
if ( pangea_msgcreate(myinfo,tp->G.tablehash,pm,datalen) != 0 )
{
hexstr = malloc(pm->sig.allocsize*2 + 1);
init_hexbytes_noT(hexstr,(uint8_t *)pm,pm->sig.allocsize);
if ( destplayer < 0 )
{
init_hexbytes_noT(tp->spacestr,(uint8_t *)pm,pm->sig.allocsize);
if ( (str= SuperNET_categorymulticast(myinfo,0,tp->G.gamehash,tp->G.tablehash,tp->spacestr,0,2,1)) != 0 )
if ( (str= SuperNET_categorymulticast(myinfo,0,tp->G.gamehash,tp->G.tablehash,hexstr,0,2,1)) != 0 )
free(str);
}
else if ( (p= tp->active[destplayer]) != 0 )
{
// encrypt here!
int32_t plaintext = 1; // for now
if ( (str= SuperNET_DHTsend(myinfo,p->ipbits,tp->G.gamehash,tp->G.tablehash,tp->spacestr,0,0,plaintext)) != 0 )
if ( (str= SuperNET_DHTsend(myinfo,p->ipbits,tp->G.gamehash,tp->G.tablehash,hexstr,0,0,plaintext)) != 0 )
free(str);
}
free(hexstr);
}
free(pm);
}
int32_t pangea_allocsize(struct table_info *tp,int32_t setptrs)

2
iguana/pangea_hand.c

@ -432,7 +432,7 @@ void pangea_preflop(PANGEA_HANDARGS)
PNACL_message("pangea_preflop invalid datalen.%d vs %ld\n",datalen,(long)(2 * N) * (N * N * sizeof(bits256)));
return;
}
//PNACL_message("preflop player.%d\n",tp->priv.myind);
PNACL_message("preflop player.%d\n",tp->priv.myind);
memcpy(tp->priv.audits,data,datalen);
if ( tp->priv.myind != pangea_slotA(tp) && tp->priv.myind != pangea_slotB(tp) )
{

Loading…
Cancel
Save