This commit is contained in:
Andrew Pamment
2018-05-22 21:02:22 +10:00
parent e7a7133af2
commit 42fdc30972
26 changed files with 1048 additions and 75 deletions

21
utils/mnetscan/Makefile Normal file
View File

@@ -0,0 +1,21 @@
CC=cc
CFLAGS=-I/usr/local/include -I../../deps/
DEPS = mnetscan.c
JAMLIB = ../../deps/jamlib/jamlib.a
OBJ = mnetscan.o
all: mnetscan
%.o: %.c $(DEPS)
$(CC) -c -o $@ $< $(CFLAGS)
$(JAMLIB):
cd ../../deps/jamlib && make -f Makefile.linux
mnetscan: $(OBJ) $(JAMLIB)
$(CC) -o mnetscan $^ $(CFLAGS) -L/usr/local/lib
.PHONY: clean
clean:
rm -f $(OBJ) mnetscan

View File

@@ -0,0 +1,5 @@
INDIR /home/andrew/MagickaBBS/mnet/out/2
OUTDIR /home/andrew/MagickaBBS/mnet/out
MSGAREA 1, /home/andrew/MagickaBBS/msgs/mnet_general, 2, 3, 4

335
utils/mnetscan/mnetscan.c Normal file
View File

@@ -0,0 +1,335 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <limits.h>
#include <sys/stat.h>
#include <unistd.h>
#include "jamlib/jam.h"
char *baseoutdir = NULL;
struct msgarea_t {
int id;
char *basedir;
int *links;
int link_count;
};
struct msg_t {
int area;
char from[32];
char to[32];
char subject[64];
uint32_t timedate;
int oaddr;
int daddr;
char reply[36];
} __attribute__ ((packed));
struct msgarea_t **areas;
int area_count;
s_JamBase *open_jam_base(char *path) {
int ret;
s_JamBase *jb;
ret = JAM_OpenMB((char *)path, &jb);
if (ret != 0) {
if (ret == JAM_IO_ERROR) {
free(jb);
ret = JAM_CreateMB((char *)path, 1, &jb);
if (ret != 0) {
free(jb);
return NULL;
}
} else {
free(jb);
return NULL;
}
}
return jb;
}
size_t trimwhitespace(char *out, size_t len, const char *str) {
if(len == 0)
return 0;
const char *end;
size_t out_size;
// Trim leading space
while(isspace((unsigned char)*str)) str++;
if(*str == 0) {
*out = 0;
return 1;
}
// Trim trailing space
end = str + strlen(str) - 1;
while(end > str && isspace((unsigned char)*end)) end--;
end++;
// Set output size to minimum of trimmed string length and buffer size minus 1
out_size = (end - str) < len-1 ? (end - str) : len-1;
// Copy trimmed string and add null terminator
memcpy(out, str, out_size);
out[out_size] = 0;
return out_size;
}
int parse_config_file(char *filename) {
FILE *fptr;
char buffer[256];
char bufferw[256];
char *ptr;
struct msgarea_t *newarea;
area_count = 0;
fptr = fopen(filename, "r");
if (!fptr) {
return 0;
}
fgets(buffer, 256, fptr);
while (!feof(fptr)) {
if (buffer[0] != ';') {
if (buffer[strlen(buffer) - 1] == '\n'){
buffer[strlen(buffer) - 1] = '\0';
if (strncasecmp(buffer, "OUTDIR", 6) == 0) {
trimwhitespace(bufferw, 256, &buffer[7]);
baseoutdir = strdup(bufferw);
} else if (strncasecmp(buffer, "MSGAREA", 7) == 0) {
newarea = NULL;
ptr = strtok(&buffer[8], ",");
if (ptr != NULL) {
newarea = (struct msgarea_t *)malloc(sizeof(struct msgarea_t));
trimwhitespace(bufferw, 256, ptr);
newarea->id = atoi(bufferw);
newarea->link_count = 0;
ptr = strtok(NULL, ",");
if (ptr != NULL) {
trimwhitespace(bufferw, 256, ptr);
newarea->basedir = strdup(bufferw);
ptr = strtok(NULL, ",");
while (ptr != NULL) {
trimwhitespace(bufferw, 256, ptr);
if (newarea->link_count == 0) {
newarea->links = (int *)malloc(sizeof(int));
} else {
newarea->links = (int *)realloc(newarea->links, sizeof(int) * (newarea->link_count + 1));
}
newarea->links[newarea->link_count] = atoi(bufferw);
newarea->link_count++;
ptr = strtok(NULL, ",");
}
}
}
if (newarea != NULL) {
if (area_count == 0) {
areas = (struct msgarea_t **)malloc(sizeof(struct msgarea_t *));
} else {
areas = (struct msgarea_t **)realloc(areas, sizeof(struct msgarea_t *) * (area_count + 1));
}
areas[area_count] = newarea;
area_count++;
}
}
} else {
fclose(fptr);
return 0;
}
}
fgets(buffer, 256, fptr);
}
fclose(fptr);
return 1;
}
int export_messages(int area) {
s_JamBase *jb;
s_JamBaseHeader jbh;
s_JamMsgHeader jmh;
s_JamSubPacket* jsp;
FILE *fptr;
char buffer[PATH_MAX];
int i;
int z;
int len;
int n;
int scanned = 0;
struct msg_t msg;
char msgid[37];
char *body;
struct stat st;
jb = open_jam_base(areas[area]->basedir);
if (!jb) {
return 0;
}
JAM_ReadMBHeader(jb, &jbh);
if (jbh.ActiveMsgs > 0) {
for (i=0;i<jbh.ActiveMsgs;i++) {
memset(&msg, 0, sizeof(struct msg_t));
memset(&jmh, 0, sizeof(s_JamMsgHeader));
z = JAM_ReadMsgHeader(jb, i, &jmh, &jsp);
if (z != 0) {
continue;
}
if (jmh.Attribute & JAM_MSG_DELETED) {
JAM_DelSubPacket(jsp);
continue;
}
if ((jmh.Attribute & JAM_MSG_SENT) || !(jmh.Attribute & JAM_MSG_LOCAL)) {
JAM_DelSubPacket(jsp);
continue;
} else {
for (z=0;z<jsp->NumFields;z++) {
if (jsp->Fields[z]->LoID == JAMSFLD_SUBJECT) {
if (jsp->Fields[z]->DatLen > 63) {
len = 64;
} else {
len = jsp->Fields[z]->DatLen;
}
memcpy(msg.subject, jsp->Fields[z]->Buffer, len);
}
if (jsp->Fields[z]->LoID == JAMSFLD_SENDERNAME) {
if (jsp->Fields[z]->DatLen > 61) {
len = 32;
} else {
len = jsp->Fields[z]->DatLen;
}
memcpy(msg.from, jsp->Fields[z]->Buffer, len);
}
if (jsp->Fields[z]->LoID == JAMSFLD_RECVRNAME) {
if (jsp->Fields[z]->DatLen > 61) {
len = 32;
} else {
len = jsp->Fields[z]->DatLen;
}
memcpy(msg.to, jsp->Fields[z]->Buffer, len);
}
if (jsp->Fields[z]->LoID == JAMSFLD_DADDRESS) {
msg.daddr = atoi(jsp->Fields[z]->Buffer);
}
if (jsp->Fields[z]->LoID == JAMSFLD_OADDRESS) {
msg.oaddr = atoi(jsp->Fields[z]->Buffer);
}
if (jsp->Fields[z]->LoID == JAMSFLD_MSGID) {
memset(msgid, 0, 37);
memcpy(msgid, jsp->Fields[z]->Buffer, (jsp->Fields[z]->DatLen > 36 ? 36 : jsp->Fields[z]->DatLen));
}
if (jsp->Fields[z]->LoID == JAMSFLD_REPLYID) {
memcpy(msg.reply, jsp->Fields[z]->Buffer, (jsp->Fields[z]->DatLen > 36 ? 36 : jsp->Fields[z]->DatLen));
}
}
msg.timedate = jmh.DateWritten;
body = (char *)malloc(jmh.TxtLen + 1);
memset(body, 0, jmh.TxtLen + 1);
JAM_ReadMsgText(jb, jmh.TxtOffset, jmh.TxtLen, (char *)body);
jmh.Attribute |= JAM_MSG_SENT;
while (1) {
z = JAM_LockMB(jb, 100);
if (z == 0) {
break;
} else if (z == JAM_LOCK_FAILED) {
sleep(1);
} else {
free(body);
JAM_DelSubPacket(jsp);
JAM_CloseMB(jb);
free(jb);
fprintf(stderr, "Error locking JAM base!\n");
return scanned;
}
}
n =JAM_ChangeMsgHeader(jb, i, &jmh);
if (n != 0) {
fprintf(stderr, "Error updating message header %d %d\n", n, JAM_Errno(jb));
}
JAM_UnlockMB(jb);
JAM_DelSubPacket(jsp);
msg.area = areas[area]->id;
for (n = 0; n < areas[area]->link_count; n++) {
snprintf(buffer, PATH_MAX, "%s/%d/", baseoutdir, areas[area]->links[n]);
if (stat(buffer, &st) != 0) {
if (mkdir(buffer, 0755) != 0) {
fprintf(stderr, "Error making directory %s\n", buffer);
continue;
}
}
snprintf(buffer, PATH_MAX, "%s/%d/%s.message", baseoutdir, areas[area]->links[n], msgid);
fptr = fopen(buffer, "wb");
if (fptr == NULL) {
fprintf(stderr, "Error creating file %s\n", buffer);
continue;
}
fwrite(&msg, sizeof(struct msg_t), 1, fptr);
fwrite(body, strlen(body), 1, fptr);
fclose(fptr);
}
scanned++;
}
}
}
JAM_CloseMB(jb);
free(jb);
return scanned;
}
int main(int argc, char **argv) {
int i;
int l;
if (argc < 2) {
fprintf(stderr, "Usage ./mnetscan mnet.cfg\n");
return -1;
}
if (!parse_config_file(argv[1])) {
fprintf(stderr, "Error parsing config file: %s\n", argv[1]);
return -1;
}
if (baseoutdir == NULL) {
fprintf(stderr, "OUTDIR must be defined\n");
return -1;
}
printf("Out Base Dir: %s\n", baseoutdir);
for (i=0;i<area_count;i++) {
printf("MsgArea: %d\n", areas[i]->id);
printf(" - path %s\n", areas[i]->basedir);
printf(" - links: ");
for (l=0;l<areas[i]->link_count;l++) {
printf("%d, ", areas[i]->links[l]);
}
printf("\n");
printf("\nExported %d messages\n", export_messages(i));
}
return 0;
}

21
utils/mnettoss/Makefile Normal file
View File

@@ -0,0 +1,21 @@
CC=cc
CFLAGS=-I/usr/local/include -I../../deps/
DEPS = mnettoss.c
JAMLIB = ../../deps/jamlib/jamlib.a
OBJ = mnettoss.o
all: mnettoss
%.o: %.c $(DEPS)
$(CC) -c -o $@ $< $(CFLAGS)
$(JAMLIB):
cd ../../deps/jamlib && make -f Makefile.linux
mnettoss: $(OBJ) $(JAMLIB)
$(CC) -o mnettoss $^ $(CFLAGS) -L/usr/local/lib
.PHONY: clean
clean:
rm -f $(OBJ) mnettoss

393
utils/mnettoss/mnettoss.c Normal file
View File

@@ -0,0 +1,393 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <limits.h>
#include <sys/stat.h>
#include <unistd.h>
#include <dirent.h>
#include "jamlib/jam.h"
char *baseindir = NULL;
struct msgarea_t {
int id;
char *basedir;
int *links;
int link_count;
};
struct msg_t {
int area;
char from[32];
char to[32];
char subject[64];
uint32_t timedate;
int oaddr;
int daddr;
char reply[36];
} __attribute__ ((packed));
struct msgarea_t **areas;
int area_count;
s_JamBase *open_jam_base(char *path) {
int ret;
s_JamBase *jb;
ret = JAM_OpenMB((char *)path, &jb);
if (ret != 0) {
if (ret == JAM_IO_ERROR) {
free(jb);
ret = JAM_CreateMB((char *)path, 1, &jb);
if (ret != 0) {
free(jb);
return NULL;
}
} else {
free(jb);
return NULL;
}
}
return jb;
}
size_t trimwhitespace(char *out, size_t len, const char *str) {
if(len == 0)
return 0;
const char *end;
size_t out_size;
// Trim leading space
while(isspace((unsigned char)*str)) str++;
if(*str == 0) {
*out = 0;
return 1;
}
// Trim trailing space
end = str + strlen(str) - 1;
while(end > str && isspace((unsigned char)*end)) end--;
end++;
// Set output size to minimum of trimmed string length and buffer size minus 1
out_size = (end - str) < len-1 ? (end - str) : len-1;
// Copy trimmed string and add null terminator
memcpy(out, str, out_size);
out[out_size] = 0;
return out_size;
}
int parse_config_file(char *filename) {
FILE *fptr;
char buffer[256];
char bufferw[256];
char *ptr;
struct msgarea_t *newarea;
area_count = 0;
fptr = fopen(filename, "r");
if (!fptr) {
return 0;
}
fgets(buffer, 256, fptr);
while (!feof(fptr)) {
if (buffer[0] != ';') {
if (buffer[strlen(buffer) - 1] == '\n'){
buffer[strlen(buffer) - 1] = '\0';
if (strncasecmp(buffer, "INDIR", 5) == 0) {
trimwhitespace(bufferw, 256, &buffer[6]);
baseindir = strdup(bufferw);
} else if (strncasecmp(buffer, "MSGAREA", 7) == 0) {
newarea = NULL;
ptr = strtok(&buffer[8], ",");
if (ptr != NULL) {
newarea = (struct msgarea_t *)malloc(sizeof(struct msgarea_t));
trimwhitespace(bufferw, 256, ptr);
newarea->id = atoi(bufferw);
newarea->link_count = 0;
ptr = strtok(NULL, ",");
if (ptr != NULL) {
trimwhitespace(bufferw, 256, ptr);
newarea->basedir = strdup(bufferw);
ptr = strtok(NULL, ",");
while (ptr != NULL) {
trimwhitespace(bufferw, 256, ptr);
if (newarea->link_count == 0) {
newarea->links = (int *)malloc(sizeof(int));
} else {
newarea->links = (int *)realloc(newarea->links, sizeof(int) * (newarea->link_count + 1));
}
newarea->links[newarea->link_count] = atoi(bufferw);
newarea->link_count++;
ptr = strtok(NULL, ",");
}
}
}
if (newarea != NULL) {
if (area_count == 0) {
areas = (struct msgarea_t **)malloc(sizeof(struct msgarea_t *));
} else {
areas = (struct msgarea_t **)realloc(areas, sizeof(struct msgarea_t *) * (area_count + 1));
}
areas[area_count] = newarea;
area_count++;
}
}
} else {
fclose(fptr);
return 0;
}
}
fgets(buffer, 256, fptr);
}
fclose(fptr);
return 1;
}
int isdupe(struct msg_t *msg, char *uuid) {
s_JamBase *jb;
s_JamBaseHeader jbh;
s_JamMsgHeader jmh;
s_JamSubPacket* jsp;
int areaid;
int i;
int z;
for (i=0;i<area_count;i++) {
if (msg->area == areas[i]->id) {
areaid = i;
break;
}
}
jb = open_jam_base(areas[areaid]->basedir);
if (!jb) {
return -1;
}
JAM_ReadMBHeader(jb, &jbh);
if (jbh.ActiveMsgs > 0) {
for (i=0;i<jbh.ActiveMsgs;i++) {
memset(&jmh, 0, sizeof(s_JamMsgHeader));
z = JAM_ReadMsgHeader(jb, i, &jmh, &jsp);
if (z != 0) {
continue;
}
for (z=0;z<jsp->NumFields;z++) {
if (jsp->Fields[z]->LoID == JAMSFLD_MSGID) {
if (strncasecmp(uuid, jsp->Fields[z]->Buffer, 36) == 0) {
JAM_DelSubPacket(jsp);
JAM_CloseMB(jb);
free(jb);
return 1;
}
}
}
}
}
JAM_CloseMB(jb);
free(jb);
return 0;
}
int import(char *filename) {
FILE *fptr;
char buffer[PATH_MAX];
char uuid[37];
struct msg_t msg;
int ret;
int areaid;
struct stat st;
int z;
int i;
char *body;
s_JamBase *jb;
s_JamBaseHeader jbh;
s_JamMsgHeader jmh;
s_JamSubPacket* jsp;
s_JamSubfield jsf;
snprintf(buffer, PATH_MAX, "%s/%s", baseindir, filename);
strncpy(uuid, filename, 36);
uuid[36] = '\0';
if (stat(buffer, &st) != 0) {
return 0;
}
fptr = fopen(buffer, "rb");
if (!fptr) {
return 0;
}
fread(&msg, sizeof(struct msg_t), 1, fptr);
ret = isdupe(&msg, uuid);
if (ret == -1) {
fclose(fptr);
return 0;
} else if (ret == 1) {
fclose(fptr);
return 1;
}
body = malloc(st.st_size - sizeof(struct msg_t) + 1);
memset(body, 0, st.st_size - sizeof(struct msg_t) + 1);
fread(body, st.st_size - sizeof(struct msg_t), 1, fptr);
fclose(fptr);
JAM_ClearMsgHeader(&jmh);
jmh.DateWritten = msg.timedate;
jmh.Attribute |= JAM_MSG_TYPEECHO;
jsp = JAM_NewSubPacket();
jsf.LoID = JAMSFLD_SENDERNAME;
jsf.HiID = 0;
jsf.DatLen = strlen(msg.from);
jsf.Buffer = msg.from;
JAM_PutSubfield(jsp, &jsf);
jsf.LoID = JAMSFLD_RECVRNAME;
jsf.HiID = 0;
jsf.DatLen = strlen(msg.to);
jsf.Buffer = msg.to;
JAM_PutSubfield(jsp, &jsf);
jsf.LoID = JAMSFLD_SUBJECT;
jsf.HiID = 0;
jsf.DatLen = strlen(msg.subject);
jsf.Buffer = msg.subject;
JAM_PutSubfield(jsp, &jsf);
sprintf(buffer, "%d", msg.oaddr);
jsf.LoID = JAMSFLD_OADDRESS;
jsf.HiID = 0;
jsf.DatLen = strlen(buffer);
jsf.Buffer = buffer;
JAM_PutSubfield(jsp, &jsf);
jsf.LoID = JAMSFLD_MSGID;
jsf.HiID = 0;
jsf.DatLen = strlen(uuid);
jsf.Buffer = uuid;
JAM_PutSubfield(jsp, &jsf);
if (strlen(msg.reply)> 0) {
jsf.LoID = JAMSFLD_REPLYID;
jsf.HiID = 0;
jsf.DatLen = strlen(msg.reply);
jsf.Buffer = msg.reply;
JAM_PutSubfield(jsp, &jsf);
jmh.ReplyCRC = JAM_Crc32(msg.reply, strlen(msg.reply));
}
for (i=0;i<area_count;i++) {
if (msg.area == areas[i]->id) {
areaid = i;
break;
}
}
jb = open_jam_base(areas[areaid]->basedir);
if (!jb) {
return 0;
}
while (1) {
z = JAM_LockMB(jb, 100);
if (z == 0) {
break;
} else if (z == JAM_LOCK_FAILED) {
sleep(1);
} else {
free(body);
JAM_DelSubPacket(jsp);
JAM_CloseMB(jb);
free(jb);
fprintf(stderr, "Error locking JAM base!\n");
return 0;
}
}
if (JAM_AddMessage(jb, &jmh, jsp, body, strlen(body))) {
JAM_UnlockMB(jb);
JAM_DelSubPacket(jsp);
JAM_CloseMB(jb);
free(jb);
fprintf(stderr, "Error Adding Message!\n");
free(body);
return 0;
}
JAM_UnlockMB(jb);
JAM_DelSubPacket(jsp);
JAM_CloseMB(jb);
free(jb);
free(body);
return 1;
}
int main(int argc, char **argv) {
int i;
int l;
int processed = 0;
DIR *indir;
struct dirent *dent;
char buffer[PATH_MAX];
if (argc < 2) {
fprintf(stderr, "Usage ./mnettoss mnet.cfg\n");
return -1;
}
if (!parse_config_file(argv[1])) {
fprintf(stderr, "Error parsing config file: %s\n", argv[1]);
return -1;
}
if (baseindir == NULL) {
fprintf(stderr, "INDIR must be defined\n");
return -1;
}
printf("In Base Dir: %s\n", baseindir);
indir = opendir(baseindir);
if (!indir) {
fprintf(stderr, "Error opening inbound directory!\n");
return -1;
}
while ((dent = readdir(indir)) != NULL) {
if (strlen(dent->d_name) < 8) {
continue;
}
if (strcasecmp(&dent->d_name[strlen(dent->d_name) - 8], ".message") == 0) {
if (import(dent->d_name)) {
processed++;
snprintf(buffer, PATH_MAX, "%s/%s", baseindir, dent->d_name);
unlink(buffer);
rewinddir(indir);
}
}
}
closedir(indir);
printf("Processed %d Messages\n", processed);
return 0;
}