Skip to content
Snippets Groups Projects
Commit 4874e5c5 authored by rswindell's avatar rswindell
Browse files

Use smb_hfield_netaddr() to properly support FidoNet netmail via the 'n'

(import netmail) command along with the '-n' option to set the recipient
net address (and network type). Previously, only Internet or QWK netmail
was supported.
parent 567380cd
No related branches found
No related tags found
No related merge requests found
...@@ -209,7 +209,6 @@ void postmsg(char type, char* to, char* to_number, char* to_address, ...@@ -209,7 +209,6 @@ void postmsg(char type, char* to, char* to_number, char* to_address,
uchar* msgtxt=NULL; uchar* msgtxt=NULL;
uchar* newtxt; uchar* newtxt;
long msgtxtlen; long msgtxtlen;
ushort net;
int i; int i;
ushort agent=AGENT_SMBUTIL; ushort agent=AGENT_SMBUTIL;
smbmsg_t msg; smbmsg_t msg;
...@@ -283,23 +282,17 @@ void postmsg(char type, char* to, char* to_number, char* to_address, ...@@ -283,23 +282,17 @@ void postmsg(char type, char* to, char* to_number, char* to_address,
if(smb.status.attr&SMB_EMAIL && (type=='N' || to_address!=NULL)) { if(smb.status.attr&SMB_EMAIL && (type=='N' || to_address!=NULL)) {
if(to_address==NULL) { if(to_address==NULL) {
printf("To Address (e.g. user@host): "); printf("To Address (e.g. user@host or 1:2/3): ");
gets(str); gets(str);
} else } else
SAFECOPY(str,to_address); SAFECOPY(str,to_address);
truncsp(str); truncsp(str);
if(*str) { if(*str) {
net=smb_netaddr_type(str); if((i=smb_hfield_netaddr(&msg,RECIPIENTNETADDR,str,NULL))!=SMB_SUCCESS) {
if((i=smb_hfield(&msg,RECIPIENTNETTYPE,sizeof(net),&net))!=SMB_SUCCESS) { fprintf(errfp,"\n%s!smb_hfield_netaddr(0x%02X) returned %d: %s\n"
fprintf(errfp,"\n%s!smb_hfield(0x%02X) returned %d: %s\n"
,beep,RECIPIENTNETTYPE,i,smb.last_error);
bail(1);
}
if((i=smb_hfield_str(&msg,RECIPIENTNETADDR,str))!=SMB_SUCCESS) {
fprintf(errfp,"\n%s!smb_hfield_str(0x%02X) returned %d: %s\n"
,beep,RECIPIENTNETADDR,i,smb.last_error); ,beep,RECIPIENTNETADDR,i,smb.last_error);
bail(1); bail(1);
} }
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment