Synchronet now requires the libarchive development package (e.g. libarchive-dev on Debian-based Linux distros, libarchive.org for more info) to build successfully.

Commit c9aa614b authored by rswindell's avatar rswindell

Removing a bunch of header field type definition that seemed like a good idea

back in 1993, but were never needed/used.
parent c3f7dcc6
......@@ -1441,14 +1441,6 @@ static JSBool js_get_msg_header_resolve(JSContext *cx, JSObject *obj, jsid id)
case SMB_POLL_ANSWER:
case SMB_CARBONCOPY:
case SMB_GROUP:
case FILEATTACH:
case DESTFILE:
case FILEATTACHLIST:
case DESTFILELIST:
case FILEREQUEST:
case FILEPASSWORD:
case FILEREQUESTLIST:
case FILEPASSWORDLIST:
case FIDOCTRL:
case FIDOSEENBY:
case FIDOPATH:
......
......@@ -839,11 +839,6 @@ static ulong sockmsgtxt(SOCKET socket, const char* prot, CRYPT_SESSION sess, smb
boundary = mimegetboundary();
file_list = strListInit();
/* Parse header fields */
for(i=0;i<msg->total_hfields;i++)
if(msg->hfield[i].type==FILEATTACH)
strListPush(&file_list,(char*)msg->hfield_dat[i]);
/* Parse subject (if necessary) */
if(!strListCount(file_list)) { /* filename(s) stored in subject */
split=strListSplitCopy(NULL,msg->subj," ");
......
......@@ -181,14 +181,6 @@
#define SENDERTIME 0x0d /* authentication/connection time */
#define SENDERSERVER 0x0e /* server hostname that authenticated user */
#define AUTHOR 0x10
#define AUTHORAGENT 0x11
#define AUTHORNETTYPE 0x12
#define AUTHORNETADDR 0x13
#define AUTHOREXT 0x14
#define AUTHORPOS 0x15
#define AUTHORORG 0x16
#define REPLYTO 0x20
#define REPLYTOAGENT 0x21
#define REPLYTONETTYPE 0x22
......@@ -205,30 +197,8 @@
#define RECIPIENTPOS 0x35
#define RECIPIENTORG 0x36
#define FORWARDTO 0x40
#define FORWARDTOAGENT 0x41
#define FORWARDTONETTYPE 0x42
#define FORWARDTONETADDR 0x43
#define FORWARDTOEXT 0x44
#define FORWARDTOPOS 0x45
#define FORWARDTOORG 0x46
#define FORWARDED 0x48
#if 0 /* Deprecating the following fields: (Jan-2009) never used */
#define RECEIVEDBY 0x50
#define RECEIVEDBYAGENT 0x51
#define RECEIVEDBYNETTYPE 0x52
#define RECEIVEDBYNETADDR 0x53
#define RECEIVEDBYEXT 0x54
#define RECEIVEDBYPOS 0x55
#define RECEIVEDBYORG 0x56
#define RECEIVED 0x58
#endif
#define SUBJECT 0x60 /* or filename */
#define SMB_SUMMARY 0x61 /* or file description */
#define SMB_COMMENT 0x62
......@@ -242,31 +212,6 @@
#define SMB_TAG_DELIMITER " "
#define SMB_COLUMNS 0x6a /* original text editor width in fixed-width columns */
#define FILEATTACH 0x70
#define DESTFILE 0x71
#define FILEATTACHLIST 0x72
#define DESTFILELIST 0x73
#define FILEREQUEST 0x74
#define FILEPASSWORD 0x75
#define FILEREQUESTLIST 0x76
#define FILEPASSWORDLIST 0x77
#define IMAGEATTACH 0x80
#define ANIMATTACH 0x81
#define FONTATTACH 0x82
#define SOUNDATTACH 0x83
#define PRESENTATTACH 0x84
#define VIDEOATTACH 0x85
#define APPDATAATTACH 0x86
#define IMAGETRIGGER 0x90
#define ANIMTRIGGER 0x91
#define FONTTRIGGER 0x92
#define SOUNDTRIGGER 0x93
#define PRESENTTRIGGER 0x94
#define VIDEOTRIGGER 0x95
#define APPDATATRIGGER 0x96
#define FIDOCTRL 0xa0
#define FIDOAREA 0xa1
#define FIDOSEENBY 0xa2
......@@ -302,16 +247,8 @@
/* Valid dfield_t.types */
#define TEXT_BODY 0x00
#define TEXT_SOUL 0x01
#define TEXT_TAIL 0x02
#define TEXT_WING 0x03
#define IMAGEEMBED 0x20
#define ANIMEMBED 0x21
#define FONTEMBED 0x22
#define SOUNDEMBED 0x23
#define PRESENTEMBED 0x24
#define VIDEOEMBED 0x25
#define APPDATAEMBED 0x26
#define UNUSED 0xff
......
......@@ -727,9 +727,6 @@ ulong SMBCALL smb_getmsgtxtlen(smbmsg_t* msg)
static void set_convenience_ptr(smbmsg_t* msg, uint16_t hfield_type, void* hfield_dat)
{
switch(hfield_type) { /* convenience variables */
case AUTHOR:
msg->from=(char*)hfield_dat;
break;
case SENDER:
if(msg->from==NULL || *(msg->from)==0) {
msg->from=(char*)hfield_dat;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment