Skip to content

Extended dht_get_nodes() parameters to get also a node id. #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Extended dht_get_nodes() parameters to get also a node id. #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae1a321
Extended dht_get_nodes() parameters to get also a node id.
raspopov May 31, 2015
b7db9fa
Spaces...
raspopov May 31, 2015
5bcee6b
Merge branch 'jech:master' into patch-6
raspopov Mar 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions dht.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2358,8 +2358,8 @@ dht_periodic(const void *buf, size_t buflen,
}

int
dht_get_nodes(struct sockaddr_in *sin, int *num,
struct sockaddr_in6 *sin6, int *num6)
dht_get_nodes(struct sockaddr_in *sin, unsigned char* id, int *num,
struct sockaddr_in6 *sin6, unsigned char* id6, int *num6)
{
int i, j;
struct bucket *b;
Expand All @@ -2377,6 +2377,7 @@ dht_get_nodes(struct sockaddr_in *sin, int *num,
while(n && i < *num) {
if(node_good(n)) {
sin[i] = *(struct sockaddr_in*)&n->ss;
if(id) memcpy( &id[i * 20], n->id, 20 );
i++;
}
n = n->next;
Expand All @@ -2389,6 +2390,7 @@ dht_get_nodes(struct sockaddr_in *sin, int *num,
while(n && i < *num) {
if(node_good(n)) {
sin[i] = *(struct sockaddr_in*)&n->ss;
if(id) memcpy( &id[i * 20], n->id, 20 );
i++;
}
n = n->next;
Expand All @@ -2409,6 +2411,7 @@ dht_get_nodes(struct sockaddr_in *sin, int *num,
while(n && j < *num6) {
if(node_good(n)) {
sin6[j] = *(struct sockaddr_in6*)&n->ss;
if(id6) memcpy( &id6[i * 20], n->id, 20 );
j++;
}
n = n->next;
Expand All @@ -2421,6 +2424,7 @@ dht_get_nodes(struct sockaddr_in *sin, int *num,
while(n && j < *num6) {
if(node_good(n)) {
sin6[j] = *(struct sockaddr_in6*)&n->ss;
if(id6) memcpy( &id6[i * 20], n->id, 20 );
j++;
}
n = n->next;
Expand Down
4 changes: 2 additions & 2 deletions dht.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ int dht_nodes(int af,
int *good_return, int *dubious_return, int *cached_return,
int *incoming_return);
void dht_dump_tables(FILE *f);
int dht_get_nodes(struct sockaddr_in *sin, int *num,
struct sockaddr_in6 *sin6, int *num6);
int dht_get_nodes(struct sockaddr_in *sin, unsigned char* id, int *num,
struct sockaddr_in6 *sin6, unsigned char* id6, int *num6);
int dht_uninit(void);

/* This must be provided by the user. */
Expand Down