Skip to content

GitLab

Synchronet
Synchronet
Source
Select Git revision
...
Target
Select Git revision
 
Commits (2)
  • Rob Swindell's avatar
    When a message has been forwarded, invalidate the "to" ext/net ptrs · 05104f13
    Rob Swindell authored 
    The convenience pointers to_ext and to_net need to be invalidated (nullified) if we are going to allow forwarding from local email boxes to network mail and keep all the original message header fields in tact.

The "Forwarded" field must now be added *before* any new recipient information (local user extension or network address of the forwarding destination).

This is part of the solution to request #83, #108, and #141.
    05104f13
  • Rob Swindell's avatar
    Dump the "forwarded" header field date/time nicely · 4617db4f
    Rob Swindell authored 
    Use ctime_r() to dump the forwarded date/time.
Correct some other unsafe uses of ctime() here (replace with cime_r).
Fix the accidental reference to the GPL license (it's actually LGPL for smblib).
    4617db4f
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 41 deletions
src/smblib/smbdump.c
View file @ 4617db4f
/* smbdump.c */
/* Synchronet message base (SMB) message header dumper */
/* $Id: smbdump.c,v 1.19 2020/05/25 00:39:47 rswindell Exp $ */
/****************************************************************************
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
* *
* Copyright Rob Swindell - http://www.synchro.net/copyright.html *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public License *
* as published by the Free Software Foundation; either version 2 *
* of the License, or (at your option) any later version. *
* See the GNU General Public License for more details: gpl.txt or *
* http://www.fsf.org/copyleft/gpl.html *
* *
* Anonymous FTP access to the most recent released source is available at *
* ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net *
* *
* Anonymous CVS access to the development source and modification history *
* is available at cvs.synchro.net:/cvsroot/sbbs, example: *
* cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login *
* (just hit return, no password is necessary) *
* cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src *
* See the GNU Lesser General Public License for more details: lgpl.txt or *
* http://www.fsf.org/copyleft/lesser.html *
* *
* For Synchronet coding style and modification guidelines, see *
* http://www.synchro.net/source.html *
* *
* You are encouraged to submit any modifications (preferably in Unix diff *
* format) via e-mail to mods@synchro.net *
* *
* Note: If this box doesn't appear square, then you need to fix your tabs. *
****************************************************************************/
#include <time.h> /* ctime */
#include "datewrap.h" /* ctime_r */
#include <string.h> /* strcat */
#include "smblib.h"
......@@ -104,6 +88,12 @@ str_list_t SMBCALL smb_msghdr_str_list(smbmsg_t* msg)
,smb_hfieldtype(msg->hfield[i].type)
,smb_netaddr(&msg->replyto_net));
break;
case FORWARDED:
tt = *(time32_t*)msg->hfield_dat[i];
strListAppendFormat(&list, HFIELD_NAME_FMT "%.24s"
,smb_hfieldtype(msg->hfield[i].type)
,ctime_r(&tt, tmp));
break;
default:
strListAppendFormat(&list, HFIELD_NAME_FMT "%s"
,smb_hfieldtype(msg->hfield[i].type)
......@@ -116,12 +106,12 @@ str_list_t SMBCALL smb_msghdr_str_list(smbmsg_t* msg)
tt=msg->hdr.when_written.time;
strListAppendFormat(&list, HFIELD_NAME_FMT "%08X %04hX %.24s %s" ,"when_written"
,msg->hdr.when_written.time, msg->hdr.when_written.zone
,ctime(&tt)
,ctime_r(&tt, tmp)
,smb_zonestr(msg->hdr.when_written.zone,NULL));
tt=msg->hdr.when_imported.time;
strListAppendFormat(&list, HFIELD_NAME_FMT "%08X %04hX %.24s %s" ,"when_imported"
,msg->hdr.when_imported.time, msg->hdr.when_imported.zone
,ctime(&tt)
,ctime_r(&tt, tmp)
,smb_zonestr(msg->hdr.when_imported.zone,NULL));
strListAppendFormat(&list, HFIELD_NAME_FMT "%04Xh" ,"type" ,msg->hdr.type);
strListAppendFormat(&list, HFIELD_NAME_FMT "%04Xh" ,"version" ,msg->hdr.version);
......@@ -154,14 +144,14 @@ str_list_t SMBCALL smb_msghdr_str_list(smbmsg_t* msg)
strListAppendFormat(&list, HFIELD_NAME_FMT "%"PRIu32,"times_downloaded" ,msg->hdr.times_downloaded);
if(msg->hdr.last_downloaded) {
tt=msg->hdr.last_downloaded;
strListAppendFormat(&list, HFIELD_NAME_FMT "%.24s" ,"last_downloaded" ,ctime(&tt));
strListAppendFormat(&list, HFIELD_NAME_FMT "%.24s" ,"last_downloaded" ,ctime_r(&tt, tmp));
}
}
/* convenience integers */
if(msg->expiration) {
tt=msg->expiration;
strListAppendFormat(&list, HFIELD_NAME_FMT "%.24s", "expiration", ctime(&tt));
strListAppendFormat(&list, HFIELD_NAME_FMT "%.24s", "expiration", ctime_r(&tt, tmp));
}
if(msg->cost)
strListAppendFormat(&list, HFIELD_NAME_FMT "%u", "cost", msg->cost);
......
src/smblib/smblib.c
View file @ 4617db4f
/* Synchronet message base (SMB) library routines */
/* $Id: smblib.c,v 1.209 2020/05/07 19:30:22 rswindell Exp $ */
// vi: tabstop=4
/****************************************************************************
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
......@@ -16,21 +13,9 @@
* See the GNU Lesser General Public License for more details: lgpl.txt or *
* http://www.fsf.org/copyleft/lesser.html *
* *
* Anonymous FTP access to the most recent released source is available at *
* ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net *
* *
* Anonymous CVS access to the development source and modification history *
* is available at cvs.synchro.net:/cvsroot/sbbs, example: *
* cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login *
* (just hit return, no password is necessary) *
* cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src *
* *
* For Synchronet coding style and modification guidelines, see *
* http://www.synchro.net/source.html *
* *
* You are encouraged to submit any modifications (preferably in Unix diff *
* format) via e-mail to mods@synchro.net *
* *
* Note: If this box doesn't appear square, then you need to fix your tabs. *
****************************************************************************/
......@@ -733,7 +718,9 @@ static void set_convenience_ptr(smbmsg_t* msg, uint16_t hfield_type, void* hfiel
break;
}
case FORWARDED: /* fall through */
msg->forwarded=TRUE;
msg->forwarded = TRUE;
msg->to_ext = NULL;
memset(&msg->to_net, 0, sizeof(msg->to_net));
break;
case SENDERAGENT:
if(!msg->forwarded)
......