Initial nodelist parsing

src/Makefile.freebsd

@@ -29,7 +29,7 @@ $(CDK):
 	cd ../deps/cdk-5.0-20161210/ && export CPPFLAGS=-I/usr/local/include && ./configure --with-ncurses
 	cd ../deps/cdk-5.0-20161210/ && $(MAKE)
 
-OBJ =  inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o menus.o
+OBJ =  inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o menus.o nodelist.o
 %.o: %.c $(DEPS)
 	$(CC) -c -o $@ $< $(CFLAGS)
 

src/Makefile.freebsd.WWW

@@ -34,7 +34,7 @@ $(CDK):
 	cd ../deps/cdk-5.0-20161210/ && export CPPFLAGS=-I/usr/local/include && ./configure --with-ncurses
 	cd ../deps/cdk-5.0-20161210/ && $(MAKE)
 
-OBJ =  ../deps/aha/aha.o ../deps/hashids/hashids.o inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o www.o www_email.o www_msgs.o www_last10.o www_files.o hashmap/hashmap.o menus.o
+OBJ =  ../deps/aha/aha.o ../deps/hashids/hashids.o inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o www.o www_email.o www_msgs.o www_last10.o www_files.o hashmap/hashmap.o menus.o nodelist.o
 %.o: %.c $(DEPS)
 	$(CC) -c -o $@ $< $(CFLAGS)
 

src/Makefile.linux

@@ -30,7 +30,7 @@ $(CDK):
 	cd ../deps/cdk-5.0-20161210/ && $(MAKE)
 
 
-OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o menus.o
+OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o menus.o nodelist.o
 %.o: %.c $(DEPS)
 	$(CC) -c -o $@ $< $(CFLAGS)
 

src/Makefile.linux.WWW

@@ -34,7 +34,7 @@ $(CDK):
 	cd ../deps/cdk-5.0-20161210/ && ./configure
 	cd ../deps/cdk-5.0-20161210/ && $(MAKE)
 
-OBJ =  ../deps/aha/aha.o ../deps/hashids/hashids.o inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o www.o www_email.o www_msgs.o www_last10.o www_files.o bluewave.o hashmap/hashmap.o menus.o
+OBJ =  ../deps/aha/aha.o ../deps/hashids/hashids.o inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o www.o www_email.o www_msgs.o www_last10.o www_files.o bluewave.o hashmap/hashmap.o menus.o nodelist.o
 %.o: %.c $(DEPS)
 	$(CC) -c -o $@ $< $(CFLAGS)
 

src/Makefile.netbsd

@@ -29,7 +29,7 @@ $(CDK):
 	cd ../deps/cdk-5.0-20161210/ && export CPPFLAGS=-I/usr/pkg/include && ./configure --with-ncurses
 	cd ../deps/cdk-5.0-20161210/ && $(MAKE)
 
-OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o menus.o
+OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o menus.o nodelist.o
 %.o: %.c $(DEPS)
 	$(CC) -c -o $@ $< $(CFLAGS)
 

src/Makefile.netbsd.WWW

@@ -34,7 +34,7 @@ $(CDK):
 	cd ../deps/cdk-5.0-20161210/ && export CPPFLAGS=-I/usr/pkg/include && ./configure --with-ncurses
 	cd ../deps/cdk-5.0-20161210/ && $(MAKE)
 
-OBJ =  ../deps/aha/aha.o ../deps/hashids/hashids.o inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o www.o www_email.o www_msgs.o www_last10.o www_files.o hashmap/hashmap.o menus.o
+OBJ =  ../deps/aha/aha.o ../deps/hashids/hashids.o inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o www.o www_email.o www_msgs.o www_last10.o www_files.o hashmap/hashmap.o menus.o nodelist.o
 %.o: %.c $(DEPS)
 	$(CC) -c -o $@ $< $(CFLAGS)
 

src/Makefile.openbsd

@@ -26,10 +26,10 @@ $(JSMN):
 	cd ../deps/jsmn/ && $(MAKE)
 
 $(CDK):
-	cd ../deps/cdk-5.0-20161210/ && export CPPFLAGS=-I/usr/pkg/include && ./configure --with-ncurses
+	cd ../deps/cdk-5.0-20161210/ && export CPPFLAGS=-I/usr/local/include && ./configure --with-ncurses
 	cd ../deps/cdk-5.0-20161210/ && $(MAKE)
 
-OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o menus.o
+OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o menus.o nodelist.o
 %.o: %.c $(DEPS)
 	$(CC) -c -o $@ $< $(CFLAGS)
 

src/Makefile.openbsd.WWW

@@ -31,10 +31,10 @@ $(JSMN):
 	cd ../deps/jsmn/ && $(MAKE)
 
 $(CDK):
-	cd ../deps/cdk-5.0-20161210/ && export CPPFLAGS=-I/usr/pkg/include && ./configure --with-ncurses
+	cd ../deps/cdk-5.0-20161210/ && export CPPFLAGS=-I/usr/local/include && ./configure --with-ncurses
 	cd ../deps/cdk-5.0-20161210/ && $(MAKE)
 
-OBJ =  ../deps/aha/aha.o ../deps/hashids/hashids.o inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o www.o www_email.o www_msgs.o www_last10.o www_files.o hashmap/hashmap.o menus.o
+OBJ =  ../deps/aha/aha.o ../deps/hashids/hashids.o inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o www.o www_email.o www_msgs.o www_last10.o www_files.o hashmap/hashmap.o menus.o nodelist.o
 %.o: %.c $(DEPS)
 	$(CC) -c -o $@ $< $(CFLAGS)
 

src/Makefile.osx

@@ -8,7 +8,7 @@ ODOORS = ../deps/odoors/libs-`uname -s`/libODoors.a
 JSMN = ../deps/jsmn/libjsmn.a
 CDK = ../deps/cdk-5-20161210/libcdk.a
 
-OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o menus.o
+OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o menus.o nodelist.o
 
 all: magicka magimail magiedit ticproc mgpost magichat fileapprove magiftpd
 

src/Makefile.osx.WWW

@@ -34,7 +34,7 @@ $(CDK):
 	cd ../deps/cdk-5.0-20161210/ && ./configure
 	cd ../deps/cdk-5.0-20161210/ && $(MAKE)
 
-OBJ =  ../deps/aha/aha.o ../deps/hashids/hashids.o inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o www.o www_email.o www_msgs.o www_last10.o www_files.o bluewave.o hashmap/hashmap.o menus.o
+OBJ =  ../deps/aha/aha.o ../deps/hashids/hashids.o inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o www.o www_email.o www_msgs.o www_last10.o www_files.o bluewave.o hashmap/hashmap.o menus.o nodelist.o
 %.o: %.c $(DEPS)
 	$(CC) -c -o $@ $< $(CFLAGS)
 

src/Makefile.sunos

@@ -30,7 +30,7 @@ $(CDK):
 	cd ../deps/cdk-5.0-20161210/ && $(MAKE)
 
 
-OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o menus.o os/sunos.o
+OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o menus.o os/sunos.o nodelist.o
 %.o: %.c $(DEPS)
 	$(CC) -c -o $@ $< $(CFLAGS)
 

src/Makefile.sunos.WWW

@@ -34,7 +34,7 @@ $(CDK):
 	cd ../deps/cdk-5.0-20161210/ && ./configure
 	cd ../deps/cdk-5.0-20161210/ && $(MAKE)
 
-OBJ =  ../deps/aha/aha.o ../deps/hashids/hashids.o inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o www.o www_email.o www_msgs.o www_last10.o bluewave.o www_files.o hashmap/hashmap.o menus.o os/sunos.o
+OBJ =  ../deps/aha/aha.o ../deps/hashids/hashids.o inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o www.o www_email.o www_msgs.o www_last10.o bluewave.o www_files.o hashmap/hashmap.o menus.o os/sunos.o nodelist.o
 %.o: %.c $(DEPS)
 	$(CC) -c -o $@ $< $(CFLAGS)
 

src/bbs.h

@@ -70,6 +70,7 @@ struct mail_conference {
 	char *name;
 	char *path;
 	char *tagline;
+	char *domain;
 	int networked;
 	int nettype;
 	int realnames;
@@ -366,4 +367,6 @@ extern char *www_create_link(int dir, int sub, int fid);
 extern char *www_decode_hash(char *hash);
 #endif
 extern int menu_system(char *menufile);
+
+extern char *nl_get_bbsname(struct fido_addr *addr, char *domain);
 #endif

src/mail_menu.c

@@ -2064,6 +2064,7 @@ void post_message(struct user_record *user) {
 	char buffer2[256];
 	int z;
 	int sem_fd;
+	char *bbsname;
 
 	s_JamBase *jb;
 	s_JamMsgHeader jmh;
@@ -2106,7 +2107,14 @@ void post_message(struct user_record *user) {
 					s_printf(get_string(122));
 					return;
 				}
-				s_printf(get_string(123), from_addr->zone, from_addr->net, from_addr->node, from_addr->point);
+				if (conf.mail_conferences[gUser->cur_mail_conf]->domain != NULL) {
+					bbsname = nl_get_bbsname(from_addr, conf.mail_conferences[gUser->cur_mail_conf]->domain);
+				} else {
+					bbsname = strdup("Unknown");
+				}
+				s_printf(get_string(123), from_addr->zone, from_addr->net, from_addr->node, from_addr->point, bbsname);
+
+				free(bbsname);
 			}
 		}
 	}

src/main.c

@@ -327,7 +327,9 @@ static int mail_area_handler(void* user, const char* section, const char* name,
 			} 
 		} else if (strcasecmp(name, "fido node") == 0) {
 			mc->fidoaddr = parse_fido_addr(value);
-		} 
+		} else if (strcasecmp(name, "domain") == 0) {
+			mc->domain = strdup(value);
+		}
 	} else {
 		// check if it's partially filled in
 		for (i=0;i<mc->mail_area_count;i++) {
@@ -551,6 +553,7 @@ static int handler(void* user, const char* section, const char* name,
 		conf->mail_conferences[conf->mail_conference_count]->tagline = NULL;
 		conf->mail_conferences[conf->mail_conference_count]->mail_area_count = 0;
 		conf->mail_conferences[conf->mail_conference_count]->nettype = 0;
+		conf->mail_conferences[conf->mail_conference_count]->domain = NULL;
 		conf->mail_conference_count++;
 	} else if (strcasecmp(section, "file directories") == 0) {
 		if (conf->file_directory_count == 0) {

src/nodelist.c

@@ -0,0 +1,53 @@
+#include <stdio.h>
+#include <string.h>
+#include <sqlite3.h>
+#include "bbs.h"
+
+extern struct bbs_config conf;
+
+char *nl_get_bbsname(struct fido_addr *addr, char *domain) {
+	sqlite3 *db;
+    sqlite3_stmt *res;
+	int rc;
+	char buffer[PATH_MAX];
+	char *ret;
+	char *sql_buf = "SELECT bbsname FROM nodelist WHERE nodeno=? AND domain=?";
+	
+	snprintf(buffer, PATH_MAX, "%s/nodelists.sq3", conf.bbs_path);
+	
+	rc = sqlite3_open(buffer, &db);
+		
+	if (rc != SQLITE_OK) {
+        dolog("Cannot open database: %s", sqlite3_errmsg(db));
+        return strdup("Unknown");
+    }
+	sqlite3_busy_timeout(db, 5000);
+	
+	rc = sqlite3_prepare_v2(db, sql_buf, -1, &res, 0);
+
+	if (rc != SQLITE_OK) {
+		sqlite3_close(db);
+		return 0;
+	}
+
+    if (addr->point == 0) {
+        snprintf(buffer, PATH_MAX, "%d:%d/%d", addr->zone, addr->net, addr->node);
+    } else {
+        // no support for point addresses yet.
+        return strdup("Unknown");
+    }
+
+    sqlite3_bind_text(res, 1, buffer, -1, 0);
+    sqlite3_bind_text(res, 2, domain, -1, 0);
+        
+	if (sqlite3_step(res) != SQLITE_ROW) {
+		sqlite3_finalize(res);
+		sqlite3_close(db);
+		return strdup("Unknown");
+	} 
+    ret = strdup(sqlite3_column_text(res, 0));
+
+	sqlite3_finalize(res);
+	sqlite3_close(db);
+	return ret;
+}