osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

TDS: make dissect_tds_prelogin_response() return a Boolean. 

It either returns 1 or 0, and that's intended as a Boolean; make it
return a gboolean and use TRUE and FALSE rather than 1 and 0.
This commit is contained in:
Guy Harris 2020-12-13 23:07:23 -08:00
parent 5a53365f60
commit 5bb776bfe3
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
epan/dissectors/packet-tds.c
View File

@ -5207,11 +5207,12 @@ netlib_check_login_pkt(tvbuff_t *tvb, guint offset, packet_info *pinfo, guint8 t
return TRUE; return TRUE;
} }
static int static gboolean
dissect_tds_prelogin_response(tvbuff_t *tvb, guint offset, proto_tree *tree, tds_conv_info_t *tds_info) dissect_tds_prelogin_response(tvbuff_t *tvb, guint offset, proto_tree *tree, tds_conv_info_t *tds_info)
{ {
guint8 token = 0; guint8 token = 0;
gint tokenoffset, tokenlen, cur = offset, valid = 0; gint tokenoffset, tokenlen, cur = offset;
gboolean valid = FALSE;
/* /*
* Test for prelogin format compliance * Test for prelogin format compliance
@ -5228,30 +5229,30 @@ dissect_tds_prelogin_response(tvbuff_t *tvb, guint offset, proto_tree *tree, tds
break; break;
if(token <= TDS7_PRELOGIN_OPTION_NONCEOPT) { if(token <= TDS7_PRELOGIN_OPTION_NONCEOPT) {
valid = 1; valid = TRUE;
} }
else { else {
valid = 0; valid = FALSE;
break; break;
} }
tokenoffset = tvb_get_ntohs(tvb, cur); tokenoffset = tvb_get_ntohs(tvb, cur);
if(tokenoffset > tvb_reported_length_remaining(tvb, 0)) { if(tokenoffset > tvb_reported_length_remaining(tvb, 0)) {
valid = 0; valid = FALSE;
break; break;
} }
cur += 2; cur += 2;
tokenlen = tvb_get_ntohs(tvb, cur); tokenlen = tvb_get_ntohs(tvb, cur);
if(tokenlen > tvb_reported_length_remaining(tvb, 0)) { if(tokenlen > tvb_reported_length_remaining(tvb, 0)) {
valid = 0; valid = FALSE;
break; break;
} }
cur += 2; cur += 2;
} }
if(token != TDS7_PRELOGIN_OPTION_TERMINATOR) { if(token != TDS7_PRELOGIN_OPTION_TERMINATOR) {
valid = 0; valid = FALSE;
} }
@ -6593,7 +6594,7 @@ dissect_tds_resp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tds_conv_i
(void) memset(&nl_data, '\0', sizeof nl_data); (void) memset(&nl_data, '\0', sizeof nl_data);
/* Test for pre-login response in case this response is not a token stream */ /* Test for pre-login response in case this response is not a token stream */
if(dissect_tds_prelogin_response(tvb, pos, tree, tds_info) == 1) if(dissect_tds_prelogin_response(tvb, pos, tree, tds_info) == TRUE)
{ {
return; return;
} }