#define KS_DHTRT_EXPIREDTIME (15*60)
#define KS_DHTRT_MAXPING 3
#define KS_DHTRT_PROCESSTABLE_INTERVAL (5*60)
-#define KS_DHTRT_PROCESSTABLE_SHORTINTERVAL (120)
+#define KS_DHTRT_PROCESSTABLE_SHORTINTERVAL120 (2*60)
+#define KS_DHTRT_PROCESSTABLE_SHORTINTERVAL60 (1*60)
#define KS_DHTRT_RECYCLE_NODE_THRESHOLD 100
/* peer flags */
typedef struct ks_dhtrt_bucket_s {
ks_dhtrt_bucket_entry_t entries[KS_DHT_BUCKETSIZE];
uint8_t count;
+ ks_time_t findtyme; /* last time a find was generated */
uint8_t expired_count;
ks_rwl_t *lock; /* lock for safe traversal of the entry array */
} ks_dhtrt_bucket_t;
void ks_dhtrt_shiftright(uint8_t *id);
static
void ks_dhtrt_shiftleft(uint8_t *id);
+static
+void ks_dhtrt_midmask(uint8_t *leftid, uint8_t *rightid, uint8_t *midpt);
+
static
void ks_dhtrt_xor(const uint8_t *id1, const uint8_t *id2, uint8_t *xor);
static
static
void ks_dhtrt_ping(ks_dhtrt_internal_t *table, ks_dhtrt_bucket_entry_t *entry);
-
+static
+void ks_dhtrt_find(ks_dhtrt_internal_t *internal, ks_dht_nodeid_t *nodeid);
/* debugging */
KS_DECLARE(ks_status_t) ks_dhtrt_delete_node(ks_dhtrt_routetable_t *table, ks_dht_node_t *node)
{
+ char buf[51];
if (!table || !table->internal) {
return KS_STATUS_FAIL;
}
if (bucket != 0) { /* we found a bucket*/
#ifdef KS_DHT_DEBUGLOCKPRINTF_
- char buf[100];
ks_log(KS_LOG_DEBUG, "Delete node: LOCKING bucket %s\n", ks_dhtrt_printableid(header->mask, buf));
#endif
ks_rwl_write_lock(bucket->lock);
s = ks_dhtrt_delete_id(bucket, node->nodeid.id);
-#ifdef KS_DHT_DEBUGLOCKPRINTF_
ks_log(KS_LOG_DEBUG, "Delete node: UNLOCKING bucket %s\n", ks_dhtrt_printableid(header->mask, buf));
-#endif
ks_rwl_write_unlock(bucket->lock);
}
/* at this point no subsequent find/query will return the node */
if (s == KS_STATUS_FAIL) {
- ks_log(KS_LOG_DEBUG, "Delete node: node not found\n");
+ ks_log(KS_LOG_DEBUG, "Delete node: node not found %s\n", ks_dhtrt_printableid(header->mask, buf));
return KS_STATUS_FAIL; /* cannot delete what we cannot find */
}
static
ks_status_t ks_dhtrt_insert_node(ks_dhtrt_routetable_t *table, ks_dht_node_t *node, enum ks_create_node_flags_t flags)
{
+ char buf[51];
if (!table || !table->internal) {
return KS_STATUS_FAIL;
}
return KS_STATUS_FAIL; /* we were not able to find a bucket*/
}
#ifdef KS_DHT_DEBUGLOCKPRINTF_
- char buf[100];
ks_log(KS_LOG_DEBUG, "Insert node: LOCKING bucket %s\n", ks_dhtrt_printableid(header->mask, buf));
#endif
}
if ( !(header->flags & BHF_LEFT) ) { /* only the left handside node can be split */
-#ifdef KS_DHT_DEBUGPRINTF_
- char bufx[100];
- ks_log(KS_LOG_DEBUG, "nodeid %s was not inserted\n", ks_dhtrt_printableid(node->nodeid.id, bufx));
-#endif
+ ks_log(KS_LOG_DEBUG, "nodeid %s was not inserted\n", ks_dhtrt_printableid(node->nodeid.id, buf));
#ifdef KS_DHT_DEBUGLOCKPRINTF_
ks_log(KS_LOG_DEBUG, "Insert node: UNLOCKING bucket %s\n", ks_dhtrt_printableid(header->mask, buf));
#endif
memcpy(newmask, header->mask, KS_DHT_NODEID_SIZE);
if (newmask[KS_DHT_NODEID_SIZE-1] == 0) { /* no more bits to shift - is this possible */
-#ifdef KS_DHT_DEBUGPRINTF_
- char bufx[100];
- ks_log(KS_LOG_DEBUG," nodeid %s was not inserted\n", ks_dhtrt_printableid(node->nodeid.id, bufx));
-#endif
+ ks_log(KS_LOG_DEBUG,"Nodeid %s was not inserted\n", ks_dhtrt_printableid(node->nodeid.id, buf));
#ifdef KS_DHT_DEBUGLOCKPRINTF_
ks_log(KS_LOG_DEBUG, "Insert node: UNLOCKING bucket %s\n", ks_dhtrt_printableid(header->mask, buf));
#endif
/* create the new bucket structures */
ks_dhtrt_bucket_header_t *newleft = ks_dhtrt_create_bucketheader(table->pool, header, newmask);
+ header->right1bit = newleft;
+ newleft->left1bit = header;
+
newleft->bucket = ks_dhtrt_create_bucket(table->pool);
newleft->flags = BHF_LEFT; /* flag as left hand side - therefore splitable */
++insanity;
}
-#ifdef KS_DHT_DEBUGPRINTF_
- char buffer[100];
- ks_log(KS_LOG_DEBUG, "Inserting nodeid %s\n", ks_dhtrt_printableid(node->nodeid.id, buffer));
- ks_log(KS_LOG_DEBUG, " ...into bucket %s\n", ks_dhtrt_printableid(header->mask, buffer));
-#endif
+ ks_log(KS_LOG_DEBUG, "Inserting nodeid %s\n", ks_dhtrt_printableid(node->nodeid.id, buf));
+ ks_log(KS_LOG_DEBUG, " ...into bucket %s\n", buf);
ks_status_t s = KS_STATUS_FAIL;
if (bucket != 0) { /* probably a logic error ?*/
#ifdef KS_DHT_DEBUGLOCKPRINTF_
- char buf[100];
- ks_log(KS_LOG_DEBUG, "Find node: read LOCKING bucket %s\n", ks_dhtrt_printableid(header->mask, buf));
+ char bufx[51];
+ ks_log(KS_LOG_DEBUG, "Find node: read LOCKING bucket %s\n", ks_dhtrt_printableid(header->mask, bufx));
#endif
ks_rwl_read_lock(bucket->lock);
ks_rwl_read_lock(node->reflock);
}
#ifdef KS_DHT_DEBUGLOCKPRINTF_
- ks_log(KS_LOG_DEBUG, "Find node: read UNLOCKING bucket %s\n", ks_dhtrt_printableid(header->mask, buf));
+ ks_log(KS_LOG_DEBUG, "Find node: read UNLOCKING bucket %s\n", ks_dhtrt_printableid(header->mask, bufx));
#endif
ks_rwl_read_unlock(bucket->lock);
}
if (header != 0 && header->bucket != 0) {
ks_rwl_write_lock(header->bucket->lock);
#ifdef KS_DHT_DEBUGLOCKPRINTF_
- char buf[100];
- ks_log(KS_LOG_DEBUG, "Touch node: write bucket %s\n", ks_dhtrt_printableid(header->mask, buf));
+ char bufx[51];
+ ks_log(KS_LOG_DEBUG, "Touch node: write bucket %s\n", ks_dhtrt_printableid(header->mask, bufx));
#endif
ks_dhtrt_bucket_entry_t *e = ks_dhtrt_find_bucketentry(header, nodeid.id);
s = KS_STATUS_SUCCESS;
}
#ifdef KS_DHT_DEBUGLOCKPRINTF_
- ks_log(KS_LOG_DEBUG, "Touch node: UNLOCKING bucket %s\n", ks_dhtrt_printableid(header->mask, buf));
+ ks_log(KS_LOG_DEBUG, "Touch node: UNLOCKING bucket %s\n", ks_dhtrt_printableid(header->mask, bufx));
#endif
ks_rwl_write_unlock(header->bucket->lock);
}
static
uint8_t ks_dhtrt_findclosest_locked_nodes(ks_dhtrt_routetable_t *table, ks_dhtrt_querynodes_t *query)
{
+ char buf[51];
uint8_t total = 0;
uint8_t cnt;
ks_dhtrt_bucket_header_t *header = ks_dhtrt_find_bucketheader(table, query->nodeid.id);
-#ifdef KS_DHT_DEBUGPRINTF_
- char buffer[100];
ks_log(KS_LOG_DEBUG, "Finding %d closest nodes for nodeid %s\n",
query->max,
- ks_dhtrt_printableid(query->nodeid.id, buffer));
- ks_log(KS_LOG_DEBUG, " ...starting at mask: %s\n", ks_dhtrt_printableid(header->mask, buffer));
-#endif
+ ks_dhtrt_printableid(query->nodeid.id, buf));
+ ks_log(KS_LOG_DEBUG, " ...starting at mask: %s\n", buf);
ks_dhtrt_sortedxors_t xort0;
memset(&xort0, 0 , sizeof(xort0));
total += cnt;
#ifdef KS_DHT_DEBUGPRINTF_
- ks_log(KS_LOG_DEBUG, "Bucket %s yielded %d nodes; total=%d\n", buffer, cnt, total);
+ ks_log(KS_LOG_DEBUG, "Bucket %s yielded %d nodes; total=%d\n", buf, cnt, total);
#endif
if (total >= query->max ||
#ifdef KS_DHT_DEBUGPRINTF_
ks_log(KS_LOG_DEBUG," stage2: sibling bucket header %s yielded %d nodes, total=%d\n",
- ks_dhtrt_printableid(header->mask, buffer), cnt, total);
+ ks_dhtrt_printableid(header->mask, buf), cnt, total);
#endif
if (total >= query->max) { /* is query answered ? */
total += cnt;
#ifdef KS_DHT_DEBUGPRINTF_
ks_log(KS_LOG_DEBUG," stage3: seaching left bucket header %s yielded %d nodes, total=%d\n",
- ks_dhtrt_printableid(lheader->mask, buffer), cnt, total);
+ ks_dhtrt_printableid(lheader->mask, buf), cnt, total);
#endif
}
#ifdef KS_DHT_DEBUGPRINTF_
else {
ks_log(KS_LOG_DEBUG," stage3: failed to find left header %s\n",
- ks_dhtrt_printableid(leftid, buffer));
+ ks_dhtrt_printableid(leftid, buf));
}
#endif
total += cnt;
#ifdef KS_DHT_DEBUGPRINTF_
ks_log(KS_LOG_DEBUG," stage3: seaching right bucket header %s yielded %d nodes, total=%d\n",
- ks_dhtrt_printableid(rheader->mask, buffer), cnt, total);
+ ks_dhtrt_printableid(rheader->mask, buf), cnt, total);
#endif
}
#ifdef KS_DHT_DEBUGPRINTF_
else {
ks_log(KS_LOG_DEBUG," stage3: failed to find right header %s\n",
- ks_dhtrt_printableid(rightid, buffer));
+ ks_dhtrt_printableid(rightid, buf));
}
#endif
/* inactive again it is considered inactive */
/* */
+ char buf[51];
+
if (!table || !table->internal) {
return;
}
ks_dhtrt_internal_t *internal = table->internal;
- int ping_count = 0;
+ int ping_count = 0;
+ int ping2_count = 0;
ks_time_t t0 = ks_time_now_sec();
- /*
- printf("process_table: %" PRId64 " %" PRId64 "\n", t0 - internal->last_process_table, internal->next_process_table_delta);
- */
-
if (t0 - internal->last_process_table < internal->next_process_table_delta) {
return;
}
if (ks_rwl_try_write_lock(b->lock) == KS_STATUS_SUCCESS) {
#ifdef KS_DHT_DEBUGLOCKPRINTF_
- char buf[100];
ks_log(KS_LOG_DEBUG,"process_table: LOCKING bucket %s\n", ks_dhtrt_printableid(header->mask, buf));
#endif
+
+ if (b->count == 0) {
+
+ if (t0 - b->findtyme >= KS_DHTRT_EXPIREDTIME) { /* bucket has been empty for a while */
+ ks_dht_nodeid_t targetid;
+ if (header->left1bit) {
+ ks_dhtrt_midmask(header->left1bit->mask, header->mask, targetid.id);
+ }
+ else if (header->right1bit) {
+ ks_dhtrt_midmask(header->mask, header->right1bit->mask, targetid.id);
+ }
+ else {
+ ks_dhtrt_shiftright(targetid.id);
+ }
+ ks_dhtrt_find(internal, &targetid);
+ continue;
+ }
+ }
+
for (int ix=0; ix<KS_DHT_BUCKETSIZE; ++ix) {
ks_dhtrt_bucket_entry_t *e = &b->entries[ix];
if ( e->flags != DHTPEER_EXPIRED &&
e->outstanding_pings >= KS_DHTRT_MAXPING ) {
-#ifdef KS_DHT_DEBUGPRINTF_
- char buf1[100];
ks_log(KS_LOG_DEBUG,"process_table: expiring node %s\n",
- ks_dhtrt_printableid(e->id, buf1));
-#endif
+ ks_dhtrt_printableid(e->id, buf));
e->flags = DHTPEER_EXPIRED;
++b->expired_count;
e->outstanding_pings = 0; /* extinguish all hope: do not retry again */
continue;
}
- /* if there are any outstanding pings - send another */
- if (e->outstanding_pings > 0) {
+ /* if not on shortest interval and there are any outstanding pings - send another */
+ if ( internal->next_process_table_delta == KS_DHTRT_PROCESSTABLE_SHORTINTERVAL120 &&
+ e->outstanding_pings > 0) {
ks_dhtrt_ping(internal, e);
- ++ping_count;
+
+ if (e->outstanding_pings == 2) {
+ ++ping2_count; /* return in 60 seconds for final check */
+ }
+ else {
+ ++ping_count;
+ }
+
continue;
}
+ /* if on shortest interval and there are two outstanding pings - send another and final */
+ if ( internal->next_process_table_delta == KS_DHTRT_PROCESSTABLE_SHORTINTERVAL60 &&
+ e->outstanding_pings >= 2) {
+ ks_dhtrt_ping(internal, e);
+ ++ping_count;
+ continue;
+ }
+
ks_time_t tdiff = t0 - e->tyme;
if (tdiff > KS_DHTRT_EXPIREDTIME) {
ks_dhtrt_process_deleted(table, 0);
- if (ping_count == 0) {
- internal->next_process_table_delta = KS_DHTRT_PROCESSTABLE_INTERVAL;
+ if (ping2_count > 0) {
+ internal->next_process_table_delta = KS_DHTRT_PROCESSTABLE_SHORTINTERVAL60;
}
+ if (ping_count > 0) {
+ internal->next_process_table_delta = KS_DHTRT_PROCESSTABLE_SHORTINTERVAL120;
+ }
else {
- internal->next_process_table_delta = KS_DHTRT_PROCESSTABLE_SHORTINTERVAL;
+ internal->next_process_table_delta = KS_DHTRT_PROCESSTABLE_INTERVAL;
}
ks_log(KS_LOG_DEBUG,"process_table complete\n");
return;
}
+static
+void ks_dhtrt_find(ks_dhtrt_internal_t *internal, ks_dht_nodeid_t *nodeid) {
+
+#ifdef KS_DHT_DEBUGPRINTF_
+ char buf[100];
+ ks_log(KS_LOG_DEBUG, "Find queued for mask %s\n", ks_dhtrt_printableid(nodeid->id, buf));
+#endif
+
+ return;
+}
+
+
+
/*
strictly for shifting the bucketheader mask
}
return;
}
+
static
void ks_dhtrt_shiftleft(uint8_t *id) {
return;
}
+static
+void ks_dhtrt_midmask(uint8_t *leftid, uint8_t *rightid, uint8_t *midpt) {
+
+ int i = 0;
+ memset(midpt, 0, sizeof KS_DHT_NODEID_SIZE);
+
+ for ( ; i < KS_DHT_NODEID_SIZE; ++i) {
+
+ if (leftid[i] == 0 && rightid[i] == 0) {
+ continue;
+ }
+ break; /* first non zero */
+ }
+
+ if (i == KS_DHT_NODEID_SIZE) {
+ return;
+ }
+
+ uint16_t x = leftid[i] + rightid[i];
+ x >>= 1;
+ midpt[i++] = (uint8_t)x;
+
+ if ( i < KS_DHT_NODEID_SIZE ) {
+ memcpy(&midpt[i], &rightid[i], KS_DHT_NODEID_SIZE-i);
+ }
+
+ return;
+}
+
/* create an xor value from two ids */
static void ks_dhtrt_xor(const uint8_t *id1, const uint8_t *id2, uint8_t *xor)
{
return t;
}
-unsigned char ks_dhtrt_isactive(ks_dhtrt_bucket_entry_t *entry)
-{
- /* todo */
- return 1;
-}
-
/* For Emacs:
* Local Variables:
static ks_thread_t *threads[10];
+static char idbuffer[51];
+
+static char *printableid(uint8_t *id)
+{
+ char *buffer = idbuffer;
+ memset(idbuffer, 0, sizeof(idbuffer));
+ for (int i = 0; i < 20; ++i, buffer+=2) {
+ sprintf(buffer, "%02x", id[i]);
+ }
+ return idbuffer;
+}
+
+
int doquery(ks_dhtrt_routetable_t *rt, uint8_t *id, enum ks_dht_nodetype_t type, enum ks_afflags_t family)
{
int ipv4_remote = 0;
int ipv4_local = 0;
+ int cix=0;
+
for (int i=0; i<200; ++i) {
- if (i%10 == 0) {
- ++nodeid.id[0];
- nodeid.id[1] = 0;
+ if (i%20 == 0) {
+ nodeid.id[cix] >>= 1;
+ if (nodeid.id[cix] == 0) ++cix;
+ nodeid.id[19] = 0;
}
else {
- ++nodeid.id[1];
+ ++nodeid.id[19];
}
ks_status_t s0 = ks_dhtrt_create_node(rt, nodeid, KS_DHT_REMOTE, ipv4, port, KS_DHTRT_CREATE_DEFAULT, &peer);
if (s0 == KS_STATUS_SUCCESS) {
}
}
-
- for (int i=0; i<2; ++i) {
- if (i%10 == 0) {
- ++nodeid.id[0];
- nodeid.id[1] = 0;
- }
- else {
- ++nodeid.id[1];
- }
-
+ for (int i=0; i<2; ++i) {
+ if (i%20 == 0) {
+ nodeid.id[cix] >>= 1;
+ if (nodeid.id[cix] == 0) ++cix;
+ nodeid.id[19] = 0;
+ }
+ else {
+ ++nodeid.id[19];
+ }
ks_status_t s0 = ks_dhtrt_create_node(rt, nodeid, KS_DHT_LOCAL, ipv4, port, KS_DHTRT_CREATE_DEFAULT, &peer);
- if (s0 == KS_STATUS_SUCCESS) {
- ks_dhtrt_touch_node(rt, nodeid);
- ++ipv4_local;
- }
- }
-
- for (int i=0; i<201; ++i) {
- if (i%10 == 0) {
- ++nodeid.id[0];
- nodeid.id[1] = 0;
- }
- else {
- ++nodeid.id[1];
- }
- ks_dhtrt_create_node(rt, nodeid, KS_DHT_REMOTE, ipv6, port, KS_DHTRT_CREATE_DEFAULT, &peer);
- ks_dhtrt_touch_node(rt, nodeid);
- }
+ if (s0 == KS_STATUS_SUCCESS) {
+ ks_dhtrt_touch_node(rt, nodeid);
+ ++ipv4_remote;
+ }
+ }
+ for (int i=0; i<200; ++i) {
+ if (i%20 == 0) {
+ nodeid.id[cix] >>= 1;
+ if (nodeid.id[cix] == 0) ++cix;
+ nodeid.id[19] = 0;
+ }
+ else {
+ ++nodeid.id[19];
+ }
+ ks_status_t s0 = ks_dhtrt_create_node(rt, nodeid, KS_DHT_REMOTE, ipv6, port, KS_DHTRT_CREATE_DEFAULT, &peer);
+ if (s0 == KS_STATUS_SUCCESS) {
+ ks_dhtrt_touch_node(rt, nodeid);
+ ++ipv4_remote;
+ }
+ }
ks_dhtrt_dump(rt, 7);
for (int i=0,i2=0,i3=0; i<10000; ++i, ++i2, ++i3) {
if (i%20 == 0) {
- nodeid.id[0] = nodeid.id[0] / 2;
- if (i2%20 == 0) {
- nodeid.id[1] = nodeid.id[1] / 2;
- i2 = 0;
- if (i3%20 == 0) {
- nodeid.id[2] = nodeid.id[2] / 2;
- }
- }
- else {
- ++nodeid.id[3];
- }
+ nodeid.id[0] = nodeid.id[0] / 2;
+ if (i2%20 == 0) {
+ nodeid.id[1] = nodeid.id[1] / 2;
+ i2 = 0;
+ if (i3%20 == 0) {
+ nodeid.id[2] = nodeid.id[2] / 2;
+ }
+ }
+ else {
+ ++nodeid.id[3];
+ }
}
else {
- ++nodeid.id[1];
+ ++nodeid.id[1];
}
ks_dhtrt_create_node(rt, nodeid, KS_DHT_REMOTE, ipv4, port, KS_DHTRT_CREATE_DEFAULT, &peer);
ks_dhtrt_touch_node(rt, nodeid);
/* build a delete queue */
+ int cix=0;
+
for(int i0=0, i1=0; i0<150; ++i0, ++i1) {
if (i0%20 == 0) {
- g_nodeid2.id[0]>>=1;
- ks_dhtrt_dump(rt, 7);
+ g_nodeid2.id[cix]>>=1;
+ //ks_dhtrt_dump(rt, 7);
+ if ( g_nodeid2.id[cix] == 0) ++cix;
+ g_nodeid2.id[19] = 0;
}
else {
- ++ g_nodeid2.id[19];
+ ++g_nodeid2.id[19];
}
ks_dhtrt_create_node(rt, g_nodeid2, KS_DHT_REMOTE, ipv4, port, KS_DHTRT_CREATE_DEFAULT, &peer);
ks_dhtrt_touch_node(rt, g_nodeid2);
}
ks_dhtrt_dump(rt, 7);
+ cix = 0;
memset(g_nodeid2.id, 0xef, KS_DHT_NODEID_SIZE);
for (int i0=0, i1=0; i0<150; ++i0, ++i1) {
if (i0%20 == 0) {
- g_nodeid2.id[0]>>=1;
+ g_nodeid2.id[cix]>>=1;
+ if ( g_nodeid2.id[cix] == 0) ++cix;
+ g_nodeid2.id[19] = 0;
}
else {
- ++ g_nodeid2.id[19];
+ ++g_nodeid2.id[19];
}
ks_dht_node_t* n = ks_dhtrt_find_node(rt, g_nodeid2);
ks_dhtrt_release_node(n);
printf("starting thread with i of %d\n", gindex); fflush(stdout);
- for (int loop=0; loop<test60loops; ++loop) {
+ for (int loop=0, cix=0; loop<test60loops; ++loop) {
for (int i=0; i<test60nodes; ++i) {
- ++nodeid.id[19];
+ if (i%20 == 0) {
+ nodeid.id[cix] >>= 1;
+ if (nodeid.id[cix] == 0) {
+ ++cix;
+ }
+ nodeid.id[19] = 0;
+ }
+ else {
+ ++nodeid.id[19];
+ }
ks_dhtrt_create_node(rt, nodeid, KS_DHT_LOCAL, ipv4, port, KS_DHTRT_CREATE_DEFAULT, &peer);
ks_sleep(1000);
ks_dhtrt_touch_node(rt, nodeid);
}
- for (int i=0; i<test60nodes; ++i) {
+ memset(nodeid.id, 0xef, KS_DHT_NODEID_SIZE);
+ cix = 0;
+
+ for (int i=0, cix=0; i<test60nodes; ++i) {
+ if (i%20 == 0) {
+ nodeid.id[cix] >>= 1;
+ if (nodeid.id[cix] == 0) {
+ ++cix;
+ }
+ nodeid.id[19] = 0;
+ }
+ else {
+ ++nodeid.id[19];
+ }
+
peer = ks_dhtrt_find_node(rt, nodeid);
if (peer) {
ks_dhtrt_delete_node(rt, peer);
ks_sleep(400);
}
- --nodeid.id[19];
}
}
int ipv4_remote = 0;
int ipv4_local = 0;
+ int cix =0;
+
for (int i=0; i<200; ++i) {
if (i%10 == 0) {
- ++nodeid.id[0];
- nodeid.id[1] = 0;
+ ++nodeid.id[cix];
+ if (nodeid.id[cix] == 0) ++cix;
+ nodeid.id[19] = 0;
}
else {
- ++nodeid.id[1];
+ ++nodeid.id[19];
}
ks_status_t s0 = ks_dhtrt_create_node(rt, nodeid, KS_DHT_REMOTE, ipv4, port, KS_DHTRT_CREATE_DEFAULT, &peer);
if (s0 == KS_STATUS_SUCCESS) {
for (int i=0; i<2; ++i) {
if (i%10 == 0) {
- ++nodeid.id[0];
- nodeid.id[1] = 0;
+ ++nodeid.id[cix];
+ if (nodeid.id[cix] == 0) ++cix;
+ nodeid.id[19] = 0;
}
else {
- ++nodeid.id[1];
+ ++nodeid.id[19];
}
ks_status_t s0 = ks_dhtrt_create_node(rt, nodeid, KS_DHT_LOCAL, ipv4, port, KS_DHTRT_CREATE_DEFAULT, &peer);
for (int i=0; i<201; ++i) {
if (i%10 == 0) {
- ++nodeid.id[0];
- nodeid.id[1] = 0;
+ ++nodeid.id[cix];
+ if (nodeid.id[cix] == 0) ++cix;
+ nodeid.id[19] = 0;
}
else {
- ++nodeid.id[1];
+ ++nodeid.id[19];
}
ks_dhtrt_create_node(rt, nodeid, KS_DHT_REMOTE, ipv6, port, KS_DHTRT_CREATE_DEFAULT, &peer);
ks_dhtrt_touch_node(rt, nodeid);
ks_status_t status;
+ int cix=0;
+
for (int i=0,i2=0; i<200; ++i, ++i2) {
if (i%20 == 0) {
- nodeid.id[0] = nodeid.id[0] / 2;
- if (i2%20 == 0) {
- i2 = 0;
- nodeid.id[1] = nodeid.id[1] / 2;
- }
- else {
- ++nodeid.id[2];
- }
+ nodeid.id[cix] = nodeid.id[cix] / 2;
+ if (nodeid.id[cix] == 0) ++cix;
+ nodeid.id[19] = 0;
}
else {
- ++nodeid.id[1];
+ ++nodeid.id[19];
}
ks_dhtrt_create_node(rt, nodeid, KS_DHT_REMOTE, ipv4, port, KS_DHTRT_CREATE_DEFAULT, &peer);
ks_dhtrt_touch_node(rt, nodeid);
}
memset(nodeid.id, 0xef, KS_DHT_NODEID_SIZE);
+ cix = 0;
+
for (int i=0,i2=0; i<200; ++i, ++i2) {
if (i%20 == 0) {
nodeid.id[0] = nodeid.id[0] / 2;
- if (i2%20 == 0) {
- i2 = 0;
- nodeid.id[1] = nodeid.id[1] / 2;
- }
- else {
- ++nodeid.id[2];
- }
+ if (nodeid.id[cix] == 0) ++cix;
+ nodeid.id[19] = 0;
}
else {
- ++nodeid.id[1];
+ ++nodeid.id[19];
}
ks_dht_node_t *n = ks_dhtrt_find_node(rt, nodeid);
if (n != NULL) {
ks_dhtrt_process_table(rt);
memset(nodeid.id, 0xef, KS_DHT_NODEID_SIZE);
+ cix = 0;
for (int i=0,i2=0; i<200; ++i, ++i2) {
- if (i%20 == 0) {
- nodeid.id[0] = nodeid.id[0] / 2;
- if (i2%20 == 0) {
- i2 = 0;
- nodeid.id[1] = nodeid.id[1] / 2;
- }
- else {
- ++nodeid.id[2];
- }
- }
- else {
- ++nodeid.id[1];
- }
+ if (i%20 == 0) {
+ nodeid.id[0] = nodeid.id[0] / 2;
+ if (nodeid.id[cix] == 0) ++cix;
+ nodeid.id[19] = 0;
+ }
+ else {
+ ++nodeid.id[19];
+ }
+
ks_dhtrt_create_node(rt, nodeid, KS_DHT_REMOTE, ipv4, port, KS_DHTRT_CREATE_DEFAULT, &peer);
ks_dhtrt_touch_node(rt, nodeid);
}
ks_status_t status;
+ int cix =0;
+
for (int i=0,i2=0; i<2; ++i, ++i2) {
- if (i%20 == 0) {
- nodeid.id[0] = nodeid.id[0] / 2;
- if (i2%20 == 0) {
- i2 = 0;
- nodeid.id[1] = nodeid.id[1] / 2;
- }
- else {
- ++nodeid.id[2];
- }
- }
- else {
- ++nodeid.id[1];
- }
+ if (i%20 == 0) {
+ nodeid.id[0] = nodeid.id[0] / 2;
+ if (nodeid.id[cix] == 0) ++cix;
+ nodeid.id[19] = 0;
+ }
+ else {
+ ++nodeid.id[19];
+ }
ks_dhtrt_create_node(rt, nodeid, KS_DHT_REMOTE, ipv4, port, KS_DHTRT_CREATE_DEFAULT, &peer);
ks_dhtrt_touch_node(rt, nodeid);
}
}
+void testid(int max) {
+
+ int cix=0;
+ unsigned char id[20];
+
+ memset(id, 0xff, 20);
+
+ for (int i=0; i<max; ++i) {
+ if (i%20 == 0) {
+ id[cix] >>= 1;
+ if (id[cix] == 0) {
+ ++cix;
+ }
+ id[19] = 0;
+ }
+ else {
+ ++id[19];
+ }
+ printf("id:%s\n", printableid(id));
+ }
+
+}
+
+
+
+
int main(int argc, char *argv[]) {
continue;
}
+ if (tests[tix] == 100) {
+ testid(340);
+ }
}
projects / thirdparty / freeswitch.git / commitdiff
