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

test

release/v0.1
jl777 9 years ago
parent
fe4695e62d
commit
cb8d6c8acb
7 changed files with 73 additions and 27 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. 13
      crypto777/inet.c
  2. 2
      iguana/SuperNET.c
  3. 2
      iguana/SuperNET.h
  4. 2
      iguana/SuperNET_category.c
  5. 4
      iguana/main.c
  6. 75
      iguana/pangea_api.c
  7. 2
      iguana/pangea_json.c

13
crypto777/inet.c
View File

@ -388,11 +388,14 @@ void expand_ipbits(char *ipaddr,uint64_t ipbits)
uint64_t calc_ipbits(char *ip_port) uint64_t calc_ipbits(char *ip_port)
{ {
uint64_t ipbits; char ipaddr[64]; uint64_t ipbits = 0; char ipaddr[64];
ipbits = _calc_ipbits(ip_port); if ( ip_port != 0 )
expand_ipbits(ipaddr,ipbits); {
if ( ipbits != 0 && strcmp(ipaddr,ip_port) != 0 ) ipbits = _calc_ipbits(ip_port);
printf("calc_ipbits error: (%s) -> %llx -> (%s)\n",ip_port,(long long)ipbits,ipaddr);//, getchar(); expand_ipbits(ipaddr,ipbits);
if ( ipbits != 0 && strcmp(ipaddr,ip_port) != 0 )
printf("calc_ipbits error: (%s) -> %llx -> (%s)\n",ip_port,(long long)ipbits,ipaddr);//, getchar();
}
return(ipbits); return(ipbits);
} }

2
iguana/SuperNET.c
View File

@ -1130,7 +1130,7 @@ TWO_STRINGS(SuperNET,subscribe,category,subcategory)
{ {
bits256 categoryhash,subhash; bits256 categoryhash,subhash;
categoryhash = calc_categoryhashes(&subhash,category,subcategory); categoryhash = calc_categoryhashes(&subhash,category,subcategory);
if ( category_sub(myinfo,categoryhash,subhash) != 0 ) if ( category_subscribe(myinfo,categoryhash,subhash) != 0 )
return(clonestr("{\"result\":\"subscribed\"}")); return(clonestr("{\"result\":\"subscribed\"}"));
else return(clonestr("{\"error\":\"couldnt subscribe\"}")); else return(clonestr("{\"error\":\"couldnt subscribe\"}"));
} }

2
iguana/SuperNET.h
View File

@ -139,7 +139,7 @@ void SuperNET_hex2str(char *str,uint8_t *hex,int32_t len);
void SuperNET_hexmsgadd(struct supernet_info *myinfo,bits256 category,bits256 subhash,char *hexmsg,struct tai now); void SuperNET_hexmsgadd(struct supernet_info *myinfo,bits256 category,bits256 subhash,char *hexmsg,struct tai now);
int32_t SuperNET_hexmsgfind(struct supernet_info *myinfo,bits256 category,bits256 subhash,char *hexmsg,int32_t addflag); int32_t SuperNET_hexmsgfind(struct supernet_info *myinfo,bits256 category,bits256 subhash,char *hexmsg,int32_t addflag);
void category_posthexmsg(struct supernet_info *myinfo,bits256 category,bits256 subhash,char *hexmsg,struct tai now); void category_posthexmsg(struct supernet_info *myinfo,bits256 category,bits256 subhash,char *hexmsg,struct tai now);
void *category_sub(struct supernet_info *myinfo,bits256 category,bits256 subhash); void *category_subscribe(struct supernet_info *myinfo,bits256 category,bits256 subhash);
struct category_msg *category_gethexmsg(struct supernet_info *myinfo,bits256 categoryhash,bits256 subhash); struct category_msg *category_gethexmsg(struct supernet_info *myinfo,bits256 categoryhash,bits256 subhash);
char *SuperNET_htmlstr(char *fname,char *htmlstr,int32_t maxsize,char *agentstr); char *SuperNET_htmlstr(char *fname,char *htmlstr,int32_t maxsize,char *agentstr);

2
iguana/SuperNET_category.c
View File

@ -99,7 +99,7 @@ void category_posthexmsg(struct supernet_info *myinfo,bits256 categoryhash,bits2
// char str[65]; printf("no subscription for category.(%s) %llx\n",bits256_str(str,categoryhash),(long long)subhash.txid); // char str[65]; printf("no subscription for category.(%s) %llx\n",bits256_str(str,categoryhash),(long long)subhash.txid);
} }
void *category_sub(struct supernet_info *myinfo,bits256 categoryhash,bits256 subhash) void *category_subscribe(struct supernet_info *myinfo,bits256 categoryhash,bits256 subhash)
{ {
struct category_info *cat,*sub; bits256 hash; struct category_info *cat,*sub; bits256 hash;
HASH_FIND(hh,Categories,categoryhash.bytes,sizeof(categoryhash),cat); HASH_FIND(hh,Categories,categoryhash.bytes,sizeof(categoryhash),cat);

4
iguana/main.c
View File

@ -456,8 +456,8 @@ void iguana_main(void *arg)
signal(SIGCONT,sigcontinue_func); signal(SIGCONT,sigcontinue_func);
if ( IGUANA_NUMHELPERS == 0 ) if ( IGUANA_NUMHELPERS == 0 )
IGUANA_NUMHELPERS = 1; IGUANA_NUMHELPERS = 1;
category_sub(&MYINFO,GENESIS_PUBKEY,GENESIS_PUBKEY); category_subscribe(&MYINFO,GENESIS_PUBKEY,GENESIS_PUBKEY);
category_sub(myinfo,calc_categoryhashes(0,"pangea",0),GENESIS_PUBKEY); category_subscribe(myinfo,calc_categoryhashes(0,"pangea",0),GENESIS_PUBKEY);
for (i=0; i<IGUANA_NUMHELPERS; i++) for (i=0; i<IGUANA_NUMHELPERS; i++)
{ {
sprintf(helperstr,"{\"name\":\"helper.%d\"}",i); sprintf(helperstr,"{\"name\":\"helper.%d\"}",i);

75
iguana/pangea_api.c
View File

@ -132,8 +132,8 @@ char *pangea_jsondatacmd(struct supernet_info *myinfo,bits256 tablehash,struct p
{ {
cJSON *argjson; char *reqstr,hexstr[8192]; int32_t datalen; bits256 pangeahash; cJSON *argjson; char *reqstr,hexstr[8192]; int32_t datalen; bits256 pangeahash;
pangeahash = calc_categoryhashes(0,"pangea",0); pangeahash = calc_categoryhashes(0,"pangea",0);
category_sub(myinfo,pangeahash,GENESIS_PUBKEY); category_subscribe(myinfo,pangeahash,GENESIS_PUBKEY);
category_sub(myinfo,pangeahash,tablehash); category_subscribe(myinfo,pangeahash,tablehash);
argjson = SuperNET_argjson(json); argjson = SuperNET_argjson(json);
jaddstr(argjson,"cmd",cmdstr); jaddstr(argjson,"cmd",cmdstr);
jaddstr(argjson,"myipaddr",myinfo->ipaddr); jaddstr(argjson,"myipaddr",myinfo->ipaddr);
@ -324,6 +324,26 @@ void pangea_tablecreate(PANGEA_HANDARGS)
} }
} }
struct table_info *pangea_table(bits256 tablehash)
{
struct table_info *tp; int32_t allocsize; bits256 pangeahash; char str[65];
pangeahash = calc_categoryhashes(0,"pangea",0);
if ( (tp= category_info(pangeahash,tablehash)) == 0 )
{
allocsize = (int32_t)(sizeof(tp->G) + sizeof(void *)*2);
if ( (tp= calloc(1,allocsize)) == 0 )
printf("error: couldnt create table.(%s)\n",bits256_str(str,tablehash));
}
if ( tp != 0 )
{
category_subscribe(SuperNET_MYINFO(0),pangeahash,tablehash);
if ( category_infoset(pangeahash,tablehash,tp) == 0 )
printf("error: couldnt set table.(%s)\n",bits256_str(str,tablehash)), tp = 0;
else tp->G.allocsize = allocsize;
}
return(tp);
}
void pangea_update(struct supernet_info *myinfo) void pangea_update(struct supernet_info *myinfo)
{ {
static struct { char *cmdstr; void (*func)(PANGEA_HANDARGS); uint64_t cmdbits; } tablecmds[] = static struct { char *cmdstr; void (*func)(PANGEA_HANDARGS); uint64_t cmdbits; } tablecmds[] =
@ -339,7 +359,7 @@ void pangea_update(struct supernet_info *myinfo)
{ "showdown", pangea_showdown }, { "summary", pangea_summary }, { "showdown", pangea_showdown }, { "summary", pangea_summary },
}; };
struct category_msg *m; bits256 pangeahash,tablehash; struct category_msg *m; bits256 pangeahash,tablehash;
struct pangea_msghdr *pm; int32_t i,allocsize; cJSON *argjson; char str[65],*agent,*method; struct pangea_msghdr *pm; int32_t i; cJSON *argjson; char *agent,*method;
uint64_t cmdbits; struct table_info *tp; uint8_t buf[sizeof(pm->sig)]; uint64_t cmdbits; struct table_info *tp; uint8_t buf[sizeof(pm->sig)];
if ( tablecmds[0].cmdbits == 0 ) if ( tablecmds[0].cmdbits == 0 )
{ {
@ -355,9 +375,9 @@ void pangea_update(struct supernet_info *myinfo)
if ( (argjson= cJSON_Parse((char *)m->msg)) != 0 ) if ( (argjson= cJSON_Parse((char *)m->msg)) != 0 )
{ {
printf("parsed pangea hex.(%s)\n",(char *)m->msg); printf("parsed pangea hex.(%s)\n",(char *)m->msg);
if ( (agent= jstr(argjson,"agent")) != 0 && (method= jstr(argjson,"method")) != 0 ) if ( (agent= jstr(argjson,"agent")) != 0 && strcmp(agent,"pangea") == 0 && (method= jstr(argjson,"method")) != 0 )
{ {
if ( strcmp(agent,"pangea") == 0 && strcmp(method,"lobby") == 0 ) if ( strcmp(method,"lobby") == 0 )
{ {
//categoryhash = jbits256(argjson,"categoryhash"); //categoryhash = jbits256(argjson,"categoryhash");
} }
@ -373,16 +393,7 @@ void pangea_update(struct supernet_info *myinfo)
acct777_rwsig(0,(void *)&pm->sig,(void *)buf), memcpy(&pm->sig,buf,sizeof(pm->sig)); acct777_rwsig(0,(void *)&pm->sig,(void *)buf), memcpy(&pm->sig,buf,sizeof(pm->sig));
iguana_rwbignum(0,pm->tablehash.bytes,sizeof(bits256),tablehash.bytes); iguana_rwbignum(0,pm->tablehash.bytes,sizeof(bits256),tablehash.bytes);
pm->tablehash = tablehash; pm->tablehash = tablehash;
if ( (tp= category_info(pangeahash,tablehash)) == 0 ) if ( (tp= pangea_table(tablehash)) != 0 && pangea_rwdata(0,pm->serialized,m->len-(int32_t)((long)pm->serialized-(long)pm),pm->serialized) > 0 )
{
allocsize = (int32_t)(sizeof(tp->G) + sizeof(void *)*2);
if ( (tp= calloc(1,allocsize)) == 0 )
printf("error: couldnt create table.(%s)\n",bits256_str(str,tablehash));
else if ( category_infoset(pangeahash,tablehash,tp) == 0 )
printf("error: couldnt set table.(%s)\n",bits256_str(str,tablehash)), tp = 0;
else tp->G.allocsize = allocsize;
}
if ( tp != 0 && pangea_rwdata(0,pm->serialized,m->len-(int32_t)((long)pm->serialized-(long)pm),pm->serialized) > 0 )
{ {
cmdbits = stringbits(pm->cmd); cmdbits = stringbits(pm->cmd);
for (i=0; i<sizeof(tablecmds)/sizeof(*tablecmds); i++) for (i=0; i<sizeof(tablecmds)/sizeof(*tablecmds); i++)
@ -542,7 +553,7 @@ ZERO_ARGS(pangea,lobby)
{ {
cJSON *retjson,*argjson; char *retstr,*result; uint8_t *buf; int32_t flag,len; struct pangea_msghdr *pm; cJSON *retjson,*argjson; char *retstr,*result; uint8_t *buf; int32_t flag,len; struct pangea_msghdr *pm;
bits256 pangeahash = calc_categoryhashes(0,"pangea",0); bits256 pangeahash = calc_categoryhashes(0,"pangea",0);
category_sub(myinfo,pangeahash,GENESIS_PUBKEY); category_subscribe(myinfo,pangeahash,GENESIS_PUBKEY);
//pangea_update(myinfo); //pangea_update(myinfo);
while ( (retstr= SuperNET_gethexmsg(IGUANA_CALLARGS,"pangea",0)) != 0 ) while ( (retstr= SuperNET_gethexmsg(IGUANA_CALLARGS,"pangea",0)) != 0 )
{ {
@ -565,6 +576,7 @@ ZERO_ARGS(pangea,lobby)
} }
else else
{ {
char *method; bits256 tablehash; struct table_info *tp;
int32_t datalen; uint8_t *serialized; uint8_t tmp[sizeof(pm->sig)]; int32_t datalen; uint8_t *serialized; uint8_t tmp[sizeof(pm->sig)];
pm = (struct pangea_msghdr *)buf; pm = (struct pangea_msghdr *)buf;
acct777_rwsig(0,(void *)&pm->sig,(void *)tmp); acct777_rwsig(0,(void *)&pm->sig,(void *)tmp);
@ -572,7 +584,36 @@ ZERO_ARGS(pangea,lobby)
datalen = len - (int32_t)sizeof(pm->sig); datalen = len - (int32_t)sizeof(pm->sig);
serialized = (void *)((long)pm + sizeof(pm->sig)); serialized = (void *)((long)pm + sizeof(pm->sig));
if ( pangea_validate(pm,acct777_msgprivkey(serialized,datalen),pm->sig.pubkey) == 0 ) if ( pangea_validate(pm,acct777_msgprivkey(serialized,datalen),pm->sig.pubkey) == 0 )
printf("<<<<<<<<<<<<< sigsize.%ld VALIDATED [%ld] len.%d\n",sizeof(pm->sig),(long)serialized-(long)pm,datalen); {
iguana_rwbignum(0,pm->tablehash.bytes,sizeof(bits256),tablehash.bytes);
pm->tablehash = tablehash;
printf("<<<<<<<<<<<<< sigsize.%ld VALIDATED [%ld] len.%d t%u allocsize.%d (%s) [%d]\n",sizeof(pm->sig),(long)serialized-(long)pm,datalen,pm->sig.timestamp,pm->sig.allocsize,(void *)pm->serialized,serialized[datalen-1]);
if ( serialized[datalen-1] == 0 && (argjson= cJSON_Parse((char *)pm->serialized)) != 0 )
{
tablehash = jbits256(argjson,"subhash");
if ( (method= jstr(argjson,"cmd")) != 0 )
{
if ( strcmp(method,"lobby") == 0 )
{
//categoryhash = jbits256(argjson,"categoryhash");
}
else if ( strcmp(method,"host") == 0 )
{
if ( (tp= pangea_table(tablehash)) != 0 )
{
pangea_gamecreate(&tp->G,pm->sig.timestamp,pm->tablehash,argjson);
tp->G.creatorbits = pm->sig.signer64bits;
}
char str[65],str2[65]; printf("new game detected (%s) vs (%s)\n",bits256_str(str,tablehash),bits256_str(str2,pm->tablehash));
}
else if ( strcmp(method,"join") == 0 )
{
printf("JOIN.(%s)\n",jprint(argjson,0));
}
}
free_json(argjson);
} else printf("ERROR >>>>>>> (%s) cant parse\n",(char *)pm->serialized);
}
else else
{ {
int32_t i; char str[65],str2[65]; int32_t i; char str[65],str2[65];

2
iguana/pangea_json.c
View File

@ -100,6 +100,8 @@ cJSON *pangea_lobbyjson(struct supernet_info *myinfo)
} }
} }
jadd(retjson,"tables",array); jadd(retjson,"tables",array);
jaddstr(retjson,"result","success");
printf("LOBBY.(%s)\n",jprint(retjson,0));
return(retjson); return(retjson);
} }

Write Preview
Loading…
Cancel
Save