planix.org/actube
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pkd_tmp inverts the message header.

Browse Source 
FossilOrigin-Name: 54946eb2e620348151a9bbf2641401fac031cc9aab8b3966c6f53346cf434be8
This commit is contained in:
7u83@mail.ru 2016-03-21 22:35:08 +00:00
parent 630faa7ca7
commit 218a2e5939
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/cw/dbg.c
View File

@ -284,8 +284,6 @@ int cw_format_pkt_hdr(char *dst,int level,struct conn *conn, uint8_t * packet, i
return s-dst; return s-dst;
@ -303,7 +301,7 @@ abort:
* @param len number of bytes to dump (size of data) * @param len number of bytes to dump (size of data)
* @return a character string with the created data ASCII dump (must be released with free) * @return a character string with the created data ASCII dump (must be released with free)
*/ */
char * cw_dbg_mkdmp( const uint8_t * data, int len) char * cw_dbg_mkdmp_c( const uint8_t * data, int len, int invlen)
{ {
int maxtlen = 2048; int maxtlen = 2048;
@ -335,9 +333,16 @@ char * cw_dbg_mkdmp( const uint8_t * data, int len)
char asc_buffer[128]; char asc_buffer[128];
char *ascdst = asc_buffer; char *ascdst = asc_buffer;
for (i = 0; i < len; i++) { if (invlen) {
sprintf(pdst, "%02X ", data[i] & 0xff); pdst+=sprintf(pdst,"\x1b[7m");
}
for (i = 0; i < len; i++) {
if (i==invlen){
pdst+=sprintf(pdst,"\x1b[27m");
}
pdst+=sprintf(pdst, "%02X ", data[i] & 0xff);
if (cw_dbg_opt_display & DBG_DISP_ASC_DMP) { if (cw_dbg_opt_display & DBG_DISP_ASC_DMP) {
int c = data[i] & 0xff; int c = data[i] & 0xff;
if (c < 0x20 || c > 0x7f) if (c < 0x20 || c > 0x7f)
@ -346,7 +351,7 @@ char * cw_dbg_mkdmp( const uint8_t * data, int len)
ascdst++; ascdst++;
} }
pdst += 3; // pdst += 3;
if ((i + 1) % rowlen == 0) { if ((i + 1) % rowlen == 0) {
int l; int l;
if (cw_dbg_opt_display & DBG_DISP_ASC_DMP) { if (cw_dbg_opt_display & DBG_DISP_ASC_DMP) {
@ -375,6 +380,10 @@ char * cw_dbg_mkdmp( const uint8_t * data, int len)
char * cw_dbg_mkdmp( const uint8_t * data, int len)
{
return cw_dbg_mkdmp_c(data,len,0);
}
@ -400,8 +409,10 @@ void cw_dbg_pkt(int level,struct conn *conn, uint8_t * packet, int len,struct so
char buf[1024]; char buf[1024];
cw_format_pkt_hdr(buf,level,conn,packet,len,from); cw_format_pkt_hdr(buf,level,conn,packet,len,from);
int hlen = cw_get_hdr_msg_offset(packet);
if (cw_dbg_is_level(DBG_PKT_DMP)){ if (cw_dbg_is_level(DBG_PKT_DMP)){
char *dmp = cw_dbg_mkdmp(packet,len); char *dmp = cw_dbg_mkdmp_c(packet,len,hlen);
cw_dbg(level,"%s%s",buf,dmp); cw_dbg(level,"%s%s",buf,dmp);
free(dmp); free(dmp);
} }