t/RN-Praxis2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hash is faulty

Browse Source
This commit is contained in:
t
2025-01-10 13:40:12 +01:00
parent c6c2d3c299
commit bb9c2d1d4c
3 changed files with 87 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dht.c
+50 -22
View File
@@ -2,6 +2,7 @@
#include <stdio.h>
#include <string.h>
#include <netdb.h>
#include <arpa/inet.h>
#include <netinet/in.h>
#include <sys/socket.h>
#include <sys/types.h>
@@ -9,36 +10,41 @@
// #define cpy(x, y, z) char *x_c = x; char *y_c = y; while(*y_c && z--) *x_c++ = *y_c++
int server_socket_udp;
void build_lookup_request(lookup_request* lr){
char *lrreq = lr->node_request;
snprintf(lr->node_request, HTTP_MAX_SIZE, "%d|%hd|%d|%s|%d\r\n\r\n", lr->message_type, htons(lr->hash_id), lr->node_id, lr->node_ip, lr->node_port);
lr->hash_id = ntohs(lr->hash_id);
lr->node_id = ntohs(lr->node_id);
lr->node_ip.s_addr = ntohl(lr->node_ip.s_addr);
lr->node_port = ntohs(lr->node_port);
// snprintf(lr->node_request, HTTP_MAX_SIZE, "%d|%hd|%d|%u|%d\r\n\r\n", lr->message_type, ntohs(lr->hash_id), ntohs(lr->node_id), ntohl(ip.s_addr), ntohs(lr->node_port));
}
void lookup_request_init(lookup_request* lr, int message_type, int node_id, char *node_ip, int node_port, uint16_t hash_id, char *node_request)
void lookup_request_init(lookup_request* lr, int message_type, int node_id, in_addr_t node_ip, int node_port, uint16_t hash_id)
{
lr->message_type = message_type;
lr->node_id = node_id;
strncpy(lr->node_ip, node_ip, NODE_IP_MAX_SIZE);
lr->node_ip.s_addr = node_ip;
lr->node_port = node_port;
lr->hash_id = hash_id;
if(node_request != NULL)
strncpy(lr->node_request, node_request, HTTP_MAX_SIZE);
}
void extract_lookup_request(lookup_request* lr){
build_lookup_request(lr);
}
void extract_lookup_request(lookup_request* lr, char* request){
sscanf(request, "%d|%hd|%d|%s|%d\r\n\r\n", &lr->message_type, &lr->hash_id, &lr->node_id, lr->node_ip, &lr->node_port);
// lr->message_type = ntohs(lr->message_type);
lr->hash_id = ntohs(lr->hash_id);
// lr->node_id = ntohs(lr->node_id);
// lr->node_port = ntohs(lr->node_port);
}
int call_network(lookup_request* lr, char *ip, int port){
int succ_sock;
struct addrinfo hints, *servinfo, *p;
int call_network(lookup_request* lr, in_addr_t ip, int port){
// int succ_sock;
struct addrinfo hints, *servinfo; // *p;
int rv;
int numbytes;
struct sockaddr_in addr;
addr.sin_family = AF_INET;
addr.sin_port = htons(port);
addr.sin_addr.s_addr = htonl(ip);
memset(&hints, 0, sizeof hints);
hints.ai_family = AF_INET;
@@ -47,11 +53,22 @@ int call_network(lookup_request* lr, char *ip, int port){
char port_str[6];
snprintf(port_str, sizeof port_str, "%d", port);
if ((rv = getaddrinfo(ip, port_str, &hints, &servinfo)) != 0) {
char ip_str[INET_ADDRSTRLEN];
inet_ntop(AF_INET, &ip, ip_str, INET_ADDRSTRLEN);
if ((rv = getaddrinfo(ip_str, port_str, &hints, &servinfo)) != 0) {
fprintf(stderr, "Func: call_network - getaddrinfo: %s\n", gai_strerror(rv));
return 1;
}
addr = *((struct sockaddr_in*) servinfo->ai_addr);
freeaddrinfo(servinfo);
lr->node_ip.s_addr = ntohl(addr.sin_addr.s_addr);
lr->node_port = ntohs(addr.sin_port);
/*
for(p = servinfo; p != NULL; p = p->ai_next) {
if ((succ_sock = socket(p->ai_family, p->ai_socktype, p->ai_protocol)) == -1) {
perror("Func: call_network - socket");
@@ -64,14 +81,25 @@ int call_network(lookup_request* lr, char *ip, int port){
fprintf(stderr, "Func: call_network - failed to create socket\n");
return 2;
}
*/
if ((numbytes = sendto(succ_sock, lr->node_request, strlen(lr->node_request), 0, p->ai_addr, p->ai_addrlen)) == -1) {
build_lookup_request(lr);
if (sendto(server_socket_udp, lr, sizeof(lookup_request), 0, (struct sockaddr*) &addr, sizeof(struct sockaddr_in)) == -1) {
perror("Func: call_network - sendto");
exit(1);
}
/*
size_t addrlen = sizeof(addr);
if (sendto(server_socket_udp, lr, sizeof(lr), 0, (struct sockaddr*)&addr, addrlen) == -1)
{
perror("Func: call_network - sendto");
exit(1);
}
*/
freeaddrinfo(servinfo);
close(succ_sock);
// freeaddrinfo(servinfo);
// close(succ_sock);
return 0;
}