ChronosXYZ/netsukuku
1
0
Fork 0
mirror of https://github.com/ChronosX88/netsukuku.git synced 2024-11-26 12:12:18 +00:00
Code Issues Projects Releases Wiki Activity

The Netsukuku console has been mostly fixed, I've made A LOT of changes! However, I keep getting a weird segmentation fault about iogetline.c not being found or something. I can't find it on my system, Apparently it's part of some version of glibc. However, apt-file search didn't bring up any results when I searched for it, And glibc is installed already. Anyway, Any help would be appreciated! Thank you for reading!

Browse Source
This commit is contained in:
MissValeska 2014-06-03 10:55:39 -07:00
parent 04d4dd7a1e
commit d238933703
3 changed files with 104 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Ntk-Console/Makefile
View File

@ -1,11 +1,14 @@
CXX=clang LDLIBS=-pthread
DEBUG=-g -pthread -Wfatal-errors -pedantic -Weffc++ -Wunreachable-code -Winline -Wredundant-decls -Wno-vla LIBS=-pthread
C=clang
DEBUG=-g -Wfatal-errors -pedantic -Weffc++ -Wunreachable-code -Winline -Wredundant-decls -Wno-vla
CFLAGS=-Wall ${DEBUG}
SRCBIN=Netsukuku-Console SRCBIN=Netsukuku-Console
all: ${SRCBIN} all: ${SRCBIN}
${SRCBIN}: Netsukuku-Console.o ${SRCBIN}: Netsukuku-Console.o
${CXX} ${LDFLAGS} ${LIBS} $^ -pthread -g -o $@ ${C} ${LDFLAGS} ${LIBS} $^ -o $@
.PHONY: clean .PHONY: clean

157
src/Ntk-Console/Netsukuku-Console.c
View File

@ -5,57 +5,64 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/un.h> #include <sys/un.h>
#include <unistd.h>
#include <errno.h> #include <errno.h>
#include "Netsukuku-Console.h" #include "Netsukuku-Console.h"
int sockfd, sockfd1, sendrecv;
struct sockaddr_un serveraddr;
struct sockaddr ntkdaddr;
int rc, length, exit_now;
char *request, *response;
void usage(); void usage();
int validity_check(char argv) { void clean_up();
switch(argv) { int validity_check(void) {
case 'help':
if(strncmp(request,"help", 4) == 0)
return 1; return 1;
break;
case 'uptime': else if(strncmp(request,"uptime", 6) == 0)
return 0; return 0;
break;
case 'kill': else if(strncmp(request,"kill", 4) == 0)
return 2; return 2;
break;
case 'version': else if(strncmp(request,"version", 7) == 0)
return 3; return 3;
break;
case 'inet_connected': else if(strncmp(request,"console_uptime", 14) == 0)
return 4;
else if(strncmp(request,"inet_connected", 14) == 0)
return 0; return 0;
break;
case 'cur_ifs': else if(strncmp(request,"cur_ifs", 7) == 0)
return 0; return 0;
break;
case 'cur_ifs_n': else if(strncmp(request,"cur_ifs_n", 9) == 0)
return 0; return 0;
break;
case 'cur_qspn_id': else if(strncmp(request,"cur_qspn_id", 11) == 0)
return 0; return 0;
break;
case 'cur_ip': else if(strncmp(request,"cur_ip", 6) == 0)
return 0; return 0;
break;
case 'cur_node': else if(strncmp(request,"cur_node", 8) == 0)
return 0; return 0;
break;
case 'ifs': else if(strncmp(request,"ifs", 3) == 0)
return 0; return 0;
break;
case 'ifs_n': else if(strncmp(request,"ifs_n", 5) == 0)
return 0; return 0;
break;
case 'console_uptime': else {
return 0;
break;
default:
printf("Incorrect or unreadable command, Please correct it.\n"); printf("Incorrect or unreadable command, Please correct it.\n");
return -1; return -1;
break;
} }
} }
@ -64,20 +71,20 @@ int validity_check(char argv) {
void *ntkd_request(void *argv) { void *ntkd_request(void *argv) {
while(sendrecv == 1) { while(sendrecv == 1) {
rc = sendto(sockfd1, request, strlen(request), 0, (struct sockaddr *)&serveraddr, strlen(serveraddr)); rc = sendto(sockfd1, request, strlen(request), 0, (struct sockaddr *)&serveraddr, (socklen_t *)strlen(&serveraddr));
if (rc < 0) { if (rc < 0) {
perror("sendto() failed"); perror("sendto() failed");
exit(-1); exit(-1);
} }
rc = recvfrom(sockfd1, response, strlen(response), MSG_WAITALL, (struct sockaddr *)&ntkdaddr, strlen(ntkdaddr)); rc = recvfrom(sockfd1, response, strlen(response), MSG_WAITALL, (struct sockaddr *)&ntkdaddr, (socklen_t *)strlen(&ntkdaddr));
if (rc < 0) { if (rc < 0) {
perror("recvfrom() failed"); perror("recvfrom() failed");
exit(-1); exit(-1);
} }
if(rc >= 0) { if(rc >= 0) {
printf("Sent and received Successfully!\n The Response was: %s", response); printf("Sent and received Successfully!\n The Response was) %s", response);
} }
@ -99,48 +106,64 @@ int opensocket(void) {
rc = bind(sockfd, (struct sockaddr *)&serveraddr, SUN_LEN(&serveraddr)); rc = bind(sockfd, (struct sockaddr *)&serveraddr, SUN_LEN(&serveraddr));
if (rc < 0) { if (rc < 0) {
perror("bind() failed"); perror("bind() failed");
clean_up();
exit(-1); exit(-1);
} }
} }
int console(void *argv) { void console(void) {
int exit_now = 0; exit_now = 1;
while(exit_now == 1) { while(exit_now == 1) {
printf("\n>") printf("\n>");
request = scanf("%s"); //request = scanf("%s");
fgets(request, 15, stdin);
if(validity_check(request) == -1) int len = strlen(request);
if (len > 0 && request[len-1] == '\n')
request[len-1] = '\0';
if(validity_check() == -1)
usage(); usage();
if(strncmp(request, "quit", 4) == 0) if(strncmp(request,"quit", 4) == 0) {
exit_now = 2;
clean_up();
exit(0); exit(0);
}
if(validity_check(request) == 0) if(validity_check() == 0)
sendrecv = 1; sendrecv = 1;
if(validity_check(request) == 1) if(validity_check() == 1)
usage(); usage();
if(validity_check(request) == 2) if(validity_check() == 2)
system("ntkd -k"); system("ntkd -k");
if(validity_check(request) == 3) { if(validity_check() == 3) {
printf("%s", VERSION_STR); printf("%s", VERSION_STR);
sendrecv = 1; sendrecv = 1;
} }
if(validity_check() == 4)
sizeof(char); // Place holder text
sendrecv = 0; sendrecv = 0;
} }
} }
int main(void) { int main(void) {
sendrecv = 0;
opensocket(); opensocket();
printf("This is the Netsukuku Console, Please type: 'help' for more information.\n"); printf("This is the Netsukuku Console, Please type 'help' for more information.\n");
console();
/* This variable is our reference to the second thread */ /* This variable is our reference to the second thread */
pthread_t NtkdRequest; pthread_t NtkdRequest;
@ -152,32 +175,20 @@ int main(void) {
} }
/* Detach the second thread */ /* Detach the second thread */
if(exit_now == 2) {
if(pthread_detach(NtkdRequest)) { if(pthread_detach(NtkdRequest)) {
fprintf(stderr, "Error joining thread\n"); fprintf(stderr, "Error detaching thread\n");
return -2; return -2;
} }
pthread_t ConsoleThread;
if(pthread_create(&ConsoleThread, NULL, console, NULL)) {
fprintf(stderr, "Error creating thread\n");
return -1;
} }
if(pthread_detach(ConsoleThread)) {
fprintf(stderr, "Error joining thread\n");
return -2;
}
return 0;
} }
void usage(void) { void usage(void) {
printf("Usage:\n" printf("Usage)\n"
" uptime Returns the time when ntkd finished the hooking, " uptime Returns the time when ntkd finished the hooking,"
"to get the the actual uptime just do: " "to get the the actual uptime just do) "
"time(0)-me.uptime \n" "time(0)-me.uptime \n"
" help Shows this\n" " help Shows this\n"
" kill Kills the running instance of netsukuku with SIGINT\n\n" " kill Kills the running instance of netsukuku with SIGINT\n\n"
@ -186,8 +197,8 @@ void usage(void) {
"\n" "\n"
" cur_ifs Lists all of the interfaces in cur_ifs\n" " cur_ifs Lists all of the interfaces in cur_ifs\n"
" cur_ifs_n Lists the number of interfaces present in `cur_ifs'\n" " cur_ifs_n Lists the number of interfaces present in `cur_ifs'\n"
"\n" "\n");
" cur_qspn_id The current qspn_id we are processing. " printf(" cur_qspn_id The current qspn_id we are processing. "
"It is cur_qspn_id[levels] big\n" "It is cur_qspn_id[levels] big\n"
" cur_ip Current IP address\n" " cur_ip Current IP address\n"
"\n" "\n"
@ -198,3 +209,21 @@ void usage(void) {
" console_uptime Gets the uptime of this console (Yet to be implemented)\n"); " console_uptime Gets the uptime of this console (Yet to be implemented)\n");
} }
void clean_up(void) {
const int optVal = 1;
const socklen_t optLen = sizeof(optVal);
setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (void*) &optVal, optLen);
setsockopt(sockfd1, SOL_SOCKET, SO_REUSEADDR, (void*) &optVal, optLen);
if (sockfd != -1)
close(sockfd);
if (sockfd1 != -1)
close(sockfd1);
unlink(SERVER_PATH);
}

8
src/Ntk-Console/Netsukuku-Console.h
View File

@ -1,14 +1,8 @@
#ifndef NETSUKUKUCONSOLE_H #ifndef NETSUKUKUCONSOLE_H
#define NETSUKUKUCONSOLE_H #define NETSUKUKUCONSOLE_H
#define SERVER_PATH "/tmp/server" #define SERVER_PATH "/tmp/ntk-console"
#define VERSION_STR "0.0.1" #define VERSION_STR "0.0.1"
#define FALSE 0 #define FALSE 0
extern int sockfd, sockfd1, sendrecv = 0;
extern struct sockaddr_un serveraddr;
extern struct sockaddr ntkdaddr;
extern int rc, length;
extern char *request, *response;
#endif /*NETSUKUKUCONSOLE_H*/ #endif /*NETSUKUKUCONSOLE_H*/