From 1397808c5625b80545d442ceba0f9b4a744fcc87 Mon Sep 17 00:00:00 2001 From: rswindell <> Date: Mon, 7 Dec 2015 03:41:20 +0000 Subject: [PATCH] Changes to sbbs_t::msghdr() - used by (H)eader command: Display translated to/from/reply net-type (from numeric to string). --- src/sbbs3/readmsgs.cpp | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/sbbs3/readmsgs.cpp b/src/sbbs3/readmsgs.cpp index 0d870e9490..06bd8b4412 100644 --- a/src/sbbs3/readmsgs.cpp +++ b/src/sbbs3/readmsgs.cpp @@ -117,10 +117,21 @@ void sbbs_t::msghdr(smbmsg_t* msg) CRLF; /* variable fields */ - for(i=0;i<msg->total_hfields;i++) - bprintf("%-16.16s %s\r\n" - ,smb_hfieldtype(msg->hfield[i].type) - ,binstr((uchar *)msg->hfield_dat[i],msg->hfield[i].length,str)); + for(i=0;i<msg->total_hfields;i++) { + char *p; + bprintf("%-16.16s ",smb_hfieldtype(msg->hfield[i].type)); + switch(msg->hfield[i].type) { + case SENDERNETTYPE: + case RECIPIENTNETTYPE: + case REPLYTONETTYPE: + p = smb_nettype((enum smb_net_type)*(uint16_t*)msg->hfield_dat[i]); + break; + default: + p = binstr((uchar *)msg->hfield_dat[i],msg->hfield[i].length,str); + break; + } + bprintf("%s\r\n", p); + } /* fixed fields */ bprintf("%-16.16s %08lX %04hX %.24s %s\r\n","when_written" -- GitLab