Apple-2-SW/emailler
1
0
Fork 0
mirror of https://github.com/bobbimanners/emailler.git synced 2025-02-21 01:28:59 +00:00
Code Issues Projects Releases Wiki Activity

POP65/SMTP65: Allow port number to be changed in email.cfg

Browse Source
This commit is contained in:
Bobbi Webber-Manners 2020-09-03 16:43:33 -04:00
parent 53cc860b89
commit fdd5daa61f
3 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/email.cfg
View File

@ -1,8 +1,8 @@
192.168.10.2
192.168.10.2:110
pi
passwordgoeshere
NODELETE
192.168.10.2
192.168.10.2:25
apple2.local
/IP65
/DATA/EMAIL

38
apps/pop65.c
View File

@ -42,6 +42,7 @@ char filename[80];
int len;
FILE *fp;
uint32_t filesize;
uint16_t pop_port;
/*
* Keypress before quit
@ -293,20 +294,27 @@ void expect(char *buf, char *s) {
* Read parms from EMAIL.CFG
*/
void readconfigfile(void) {
fp = fopen("EMAIL.CFG", "r");
if (!fp) {
puts("Can't open config file EMAIL.CFG");
error_exit();
}
fscanf(fp, "%s", cfg_server);
fscanf(fp, "%s", cfg_user);
fscanf(fp, "%s", cfg_pass);
fscanf(fp, "%s", cfg_pop_delete);
fscanf(fp, "%s", cfg_smtp_server);
fscanf(fp, "%s", cfg_smtp_domain);
fscanf(fp, "%s", cfg_instdir);
fscanf(fp, "%s", cfg_emaildir);
fclose(fp);
char *colon;
fp = fopen("EMAIL.CFG", "r");
if (!fp) {
puts("Can't open config file EMAIL.CFG");
error_exit();
}
fscanf(fp, "%s", cfg_server);
fscanf(fp, "%s", cfg_user);
fscanf(fp, "%s", cfg_pass);
fscanf(fp, "%s", cfg_pop_delete);
fscanf(fp, "%s", cfg_smtp_server);
fscanf(fp, "%s", cfg_smtp_domain);
fscanf(fp, "%s", cfg_instdir);
fscanf(fp, "%s", cfg_emaildir);
fclose(fp);
colon = strchr(cfg_smtp_server, ':');
if (!colon)
pop_port = 110;
else
pop_port = atoi(colon + 1);
}
/*
@ -515,7 +523,7 @@ void main(int argc, char *argv[]) {
printf("Ok\nConnecting to %s - ", cfg_server);
if (!w5100_connect(parse_dotted_quad(cfg_server), 110)) {
if (!w5100_connect(parse_dotted_quad(cfg_server), pop_port)) {
printf("Fail\n");
error_exit();
}

40
apps/smtp65.c
View File

@ -42,6 +42,7 @@ char filename[80];
int len;
FILE *fp;
uint32_t filesize;
uint16_t smtp_port;
/*
* Keypress before quit
@ -329,21 +330,28 @@ uint8_t expect(char *buf, char *s) {
* Read parms from EMAIL.CFG
*/
void readconfigfile(void) {
fp = fopen("EMAIL.CFG", "r");
if (!fp) {
puts("Can't open config file EMAIL.CFG");
error_exit();
}
fscanf(fp, "%s", cfg_server);
fscanf(fp, "%s", cfg_user);
fscanf(fp, "%s", cfg_pass);
fscanf(fp, "%s", cfg_pop_delete);
fscanf(fp, "%s", cfg_smtp_server);
fscanf(fp, "%s", cfg_smtp_domain);
fscanf(fp, "%s", cfg_instdir);
fscanf(fp, "%s", cfg_emaildir);
fscanf(fp, "%s", cfg_emailaddr);
fclose(fp);
char *colon;
fp = fopen("EMAIL.CFG", "r");
if (!fp) {
puts("Can't open config file EMAIL.CFG");
error_exit();
}
fscanf(fp, "%s", cfg_server);
fscanf(fp, "%s", cfg_user);
fscanf(fp, "%s", cfg_pass);
fscanf(fp, "%s", cfg_pop_delete);
fscanf(fp, "%s", cfg_smtp_server);
fscanf(fp, "%s", cfg_smtp_domain);
fscanf(fp, "%s", cfg_instdir);
fscanf(fp, "%s", cfg_emaildir);
fscanf(fp, "%s", cfg_emailaddr);
fclose(fp);
colon = strchr(cfg_smtp_server, ':');
if (!colon)
smtp_port = 25;
else
smtp_port = atoi(colon + 1);
}
/*
@ -521,7 +529,7 @@ void main(int argc, char *argv[]) {
printf("Ok\nConnecting to %s - ", cfg_smtp_server);
if (!w5100_connect(parse_dotted_quad(cfg_smtp_server), 25)) {
if (!w5100_connect(parse_dotted_quad(cfg_smtp_server), smtp_port)) {
printf("Fail\n");
error_exit();
}