I've been working on a console for netsukuku! As the exclude argument almost definitely works now, I can work on other things. I, Also, Will need a console for further testing of netsukuku, And of the exclude argument. If any of you can help, Or test, I would very much appreciate it if you were to do so! Thank you for reading. :)

This commit is contained in:
MissValeska 2014-06-02 00:14:19 -07:00
parent 15ddf1c45b
commit 9e20200410
4 changed files with 305 additions and 0 deletions

13
src/Ntk-Console/Makefile Normal file
View File

@ -0,0 +1,13 @@
CXX=clang
DEBUG=-g -pthread -Wfatal-errors -pedantic -Weffc++ -Wunreachable-code -Winline -Wredundant-decls -Wno-vla
SRCBIN=Netsukuku-Console
all: ${SRCBIN}
${SRCBIN}: Netsukuku-Console.o
${CXX} ${LDFLAGS} ${LIBS} $^ -pthread -g -o $@
.PHONY: clean
clean:
rm -f *.o ${SRCBIN}

View File

@ -0,0 +1,113 @@
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include "Netsukuku-Console.h"
int fd[2];
pid_t ntkd_pid;
/* this function is run by the second thread */
void *server_opt_pipe(void *args) {
int i;
int* ServIter = (int*)&server_opt;
for(i = 0; i<33; i++) {
printf("%d\n",*(ServIter + i));
}
}
/*
* is_ntkd_already_running
*
* Returns 1 if there's already a ntkd running
*/
int is_ntkd_already_running(void)
{
pid_t oldpid;
FILE *fd;
if(!(fd=fopen(server_opt.pid_file, "r"))) {
if(errno != ENOENT)
printf("Cannot read pid file \"%s\": %s\n",
server_opt.pid_file, strerror(errno));
return 0;
}
fscanf(fd, "ntkd %d\n", &oldpid);
if(ferror(fd)) {
printf("error reading pid file \"%s\": %s\n",
server_opt.pid_file, strerror(errno));
fclose(fd);
return 0;
}
fclose(fd);
return !kill(oldpid, 0);
}
int openpipe(void) {
if(is_ntkd_already_running() == 1){
char process_name[256] = {0};
pid_t pid1;
printf("...Opening Pipe to ntkd...\n");
FILE *fd1=fopen(server_opt.pid_file, "r");
while(fscanf(fd1, "%s %d", process_name, &pid1)!=EOF) {
if(strcmp(process_name, "ntkd") == 0) {
ntkd_pid = pid1;
if (pipe(fd) == -1) {
printf("Error in Pipe Creation: %s\n", strerror(errno));
exit(1);
}
}
}
fclose(fd1);
}
else if(is_ntkd_already_running() == 0) {
printf("ntkd is not running\n ...Exiting...\n");
exit(0);
}
}
int main(void) {
server_opt.pid_file="/ntkd.pid";
openpipe();
printf("This is the Netsukuku Console, Please type: 'help' for more information.\n");
server_opt_pipe(NULL);
/* This variable is our reference to the second thread */
pthread_t NetsukukuServeroptPipe;
/* create a second thread which executes inc_x(&x) */
if(pthread_create(&NetsukukuServeroptPipe, NULL, server_opt_pipe, NULL)) {
fprintf(stderr, "Error creating thread\n");
return 1;
}
/* wait for the second thread to finish */
if(pthread_join(NetsukukuServeroptPipe, NULL)) {
fprintf(stderr, "Error joining thread\n");
return 2;
}
return 0;
}

View File

@ -0,0 +1,177 @@
#ifndef NETSUKUKUCONSOLE_H
#define NETSUKUKUCONSOLE_H
#define MAX_INTERFACES 16 /* The maximum number of network
interfaces, which can be used
by Netsukuku */
/*
* current_globals
*
* Here there are the main globals variables used among the code.
*/
/*struct current_globals
{
/*
* Internal map
*/
//map_node *int_map; /*Internal Map*/
/*
* External map
*/
//map_gnode **ext_map; /*External Map. */
//quadro_group cur_quadg;
/*
* Border nodes maps.(bmap.h)
*/
//map_bnode **bnode_map;
//u_int *bmap_nodes; /* bnode counter for each map*/
//u_int *bmap_nodes_closed; /* number of closed bnodes */
//u_int *bmap_nodes_opened; /* " " opened " */
/*
* Myself
*/
//inet_prefix cur_ip;
//map_node *cur_node;
/*
* external rnode cache list. (see gmap.h)
*/
//ext_rnode_cache *cur_erc;
//u_int cur_erc_counter;
/*
* Current Qspn id and qspn time
*/
//int *cur_qspn_id; /*The current qspn_id we are processing.
// It is cur_qspn_id[levels] big*/
//struct timeval *cur_qspn_time; /*When the last qspn round was received/sent
// (gettimeofday format)*/
/*
* Internet gateways
*/
//inet_gw **igws;
//int *igws_counter;
/*inet_gw **my_igws; /* my_igws[level] points to our inet gateway
present at igws[level]. It's the same of using
igw_find_node(igws, me.cur_quadg.gnode[_EL(level)]); */
//u_char my_bandwidth; /* The bandwidth of the Internet connection
// we are sharing*/
//u_char inet_connected; /* If it is 1, we are connected to the Internet */
/*
* Network interfaces
*/
//interface cur_ifs[MAX_INTERFACES];
//int cur_ifs_n; /* number of interfaces present
// in `cur_ifs' */
/*time_t uptime; /*The time when we finished the hooking,
to get the the actual uptime just do:
time(0)-me.uptime*/
//}me;
#define NTK_TCP_PORT 269
#define NTK_UDP_RADAR_PORT 269
#define ANDNA_UDP_PORT 277
#define ANDNA_TCP_PORT 277
const static u_short ntk_udp_radar_port = NTK_UDP_RADAR_PORT,
ntk_tcp_port = NTK_TCP_PORT;
const static u_short andna_udp_port = ANDNA_UDP_PORT,
andna_tcp_port = ANDNA_TCP_PORT;
#define NTK_CONFIG_FILE CONF_DIR "/netsukuku.conf"
#define NTK_PID_FILE PID_DIR "/ntkd.pid"
#define INT_MAP_FILE DATA_DIR "/ntk_internal_map"
#define EXT_MAP_FILE DATA_DIR "/ntk_external_map"
#define BNODE_MAP_FILE DATA_DIR "/ntk_bnode_map"
#define ANDNA_HNAMES_FILE CONF_DIR "/andna_hostnames"
#define SNSD_NODES_FILE CONF_DIR "/snsd_nodes"
#define ANDNA_CACHE_FILE DATA_DIR "/andna_cache"
#define LCLKEY_FILE DATA_DIR "/andna_lcl_keyring"
#define LCL_FILE DATA_DIR "/andna_lcl_cache"
#define RHC_FILE DATA_DIR "/andna_rh_cache"
#define COUNTER_C_FILE DATA_DIR "/andna_counter_cache"
#define IPMASQ_SCRIPT_FILE CONF_DIR "/ip_masquerade.sh"
#define TCSHAPER_SCRIPT_FILE CONF_DIR "/tc_shaper.sh"
/*
* ServOpt
*
* Options
*/
typedef struct
{
char *config_file;
char *pid_file;
int family;
char *ifs[MAX_INTERFACES];
int ifs_n; /* number of interfaces present in `ifs' */
char *int_map_file;
char *ext_map_file;
char *bnode_map_file;
char *andna_hnames_file;
char *snsd_nodes_file;
char *andna_cache_file;
char *lclkey_file;
char *lcl_file;
char *rhc_file;
char *counter_c_file;
char daemon;
char restricted;
int restricted_class;
char inet_connection;/* If it's 1, we are connected
to the Internet */
char share_internet;
char shape_internet;
char use_shared_inet;
//inet_prefix inet_gw;
char *inet_gw_dev;
char **inet_hosts; /* Hosts to be pinged in order to check
if the internet connection is up */
int inet_hosts_counter;
char *ip_masq_script;
char *tc_shaper_script;
/* The bandwidths of the Internet connection we are sharing.
* If we are just leeching they are all 0. */
//u_int my_upload_bw;
//u_int my_dnload_bw;
char disable_andna;
char disable_resolvconf;
int max_connections;
int max_accepts_per_host;
int max_accepts_per_host_time;
char dbg_lvl;
}ServOpt;
ServOpt server_opt;
time_t sigterm_timestamp, sighup_timestamp, sigalrm_timestamp;
#define MAX_CONNECTIONS 512
#define MAX_ACCEPTS 16
#define FREE_ACCEPT_TIME 4 /*in seconds*/
#define setzero(_p, _sz) memset((_p), 0, (_sz))
#endif /*NETSUKUKUCONSOLE_H*/

View File

@ -0,0 +1,2 @@
#!/bin/bash
clang Netsukuku-Console.c -o Netsukuku-Console -pthread -g