retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

Better handling of bad HDLC frames in T.38 gateway operation.

This commit is contained in:
Steve Underwood 2014-07-18 10:29:23 +08:00
parent 52435978d0
commit 33a4adba62
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libs/spandsp/src/t38_gateway.c
View File

@ -1914,7 +1914,7 @@ static void t38_hdlc_rx_put_bit(hdlc_rx_state_t *t, int new_bit)
} }
/*endif*/ /*endif*/
t->num_bits++; t->num_bits++;
if (!t->framing_ok_announced) if (t->flags_seen < t->framing_ok_threshold)
return; return;
/*endif*/ /*endif*/
t->byte_in_progress = (t->byte_in_progress >> 1) | ((t->raw_bit_stream & 0x01) << 7); t->byte_in_progress = (t->byte_in_progress >> 1) | ((t->raw_bit_stream & 0x01) << 7);
@ -1922,17 +1922,26 @@ static void t38_hdlc_rx_put_bit(hdlc_rx_state_t *t, int new_bit)
return; return;
/*endif*/ /*endif*/
t->num_bits = 0; t->num_bits = 0;
s = (t38_gateway_state_t *) t->frame_user_data;
u = &s->core.to_t38;
if (t->len >= (int) sizeof(t->buffer)) if (t->len >= (int) sizeof(t->buffer))
{ {
/* This is too long. Abandon the frame, and wait for the next flag octet. */ /* This is too long. Abandon the frame, and wait for the next flag octet. */
if ((t->len + 2) >= u->octets_per_data_packet)
{
/* We will have sent some of this frame already, so we need to send termination of this bad HDLC frame. */
category = (s->t38x.current_tx_data_type == T38_DATA_V21) ? T38_PACKET_CATEGORY_CONTROL_DATA : T38_PACKET_CATEGORY_IMAGE_DATA;
if (t38_core_send_data(&s->t38x.t38, s->t38x.current_tx_data_type, T38_FIELD_HDLC_FCS_BAD, NULL, 0, category) < 0)
span_log(&s->logging, SPAN_LOG_WARNING, "T.38 send failed\n");
/*endif*/
}
/*endif*/
t->rx_length_errors++; t->rx_length_errors++;
t->flags_seen = t->framing_ok_threshold - 1; t->flags_seen = t->framing_ok_threshold - 1;
t->len = 0; t->len = 0;
return; return;
} }
/*endif*/ /*endif*/
s = (t38_gateway_state_t *) t->frame_user_data;
u = &s->core.to_t38;
t->buffer[t->len] = (uint8_t) t->byte_in_progress; t->buffer[t->len] = (uint8_t) t->byte_in_progress;
if (t->len == 1) if (t->len == 1)
{ {
@ -1969,7 +1978,7 @@ static void t38_hdlc_rx_put_bit(hdlc_rx_state_t *t, int new_bit)
} }
if (++u->data_ptr >= u->octets_per_data_packet) if (++u->data_ptr >= u->octets_per_data_packet)
{ {
bit_reverse(u->data, t->buffer + t->len - 2 - u->data_ptr, u->data_ptr); bit_reverse(u->data, &t->buffer[t->len - 2 - u->data_ptr], u->data_ptr);
category = (s->t38x.current_tx_data_type == T38_DATA_V21) ? T38_PACKET_CATEGORY_CONTROL_DATA : T38_PACKET_CATEGORY_IMAGE_DATA; category = (s->t38x.current_tx_data_type == T38_DATA_V21) ? T38_PACKET_CATEGORY_CONTROL_DATA : T38_PACKET_CATEGORY_IMAGE_DATA;
if (t38_core_send_data(&s->t38x.t38, s->t38x.current_tx_data_type, T38_FIELD_HDLC_DATA, u->data, u->data_ptr, category) < 0) if (t38_core_send_data(&s->t38x.t38, s->t38x.current_tx_data_type, T38_FIELD_HDLC_DATA, u->data, u->data_ptr, category) < 0)
span_log(&s->logging, SPAN_LOG_WARNING, "T.38 send failed\n"); span_log(&s->logging, SPAN_LOG_WARNING, "T.38 send failed\n");

3
libs/spandsp/tests/fax_tests.c
View File

@ -420,8 +420,7 @@ static void set_t30_callbacks(t30_state_t *t30, int chan)
} }
/*- End of function --------------------------------------------------------*/ /*- End of function --------------------------------------------------------*/
static void real_time_gateway_frame_handler(t38_gateway_state_t *s, static void real_time_gateway_frame_handler(void *user_data,
void *user_data,
bool incoming, bool incoming,
const uint8_t *msg, const uint8_t *msg,
int len) int len)

4
libs/spandsp/tests/v22bis_tests.c
View File

@ -263,11 +263,11 @@ int main(int argc, char *argv[])
int j; int j;
int test_bps; int test_bps;
int line_model_no; int line_model_no;
int channel_codec;
int rbs_pattern;
int bits_per_test; int bits_per_test;
int noise_level; int noise_level;
int signal_level; int signal_level;
int channel_codec;
int rbs_pattern;
int guard_tone_option; int guard_tone_option;
int opt; int opt;
bool log_audio; bool log_audio;