maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added detection and skip of incomplete message at end of file when reading a message file.

Browse Source 
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4597 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
winckel
2013-12-04 17:04:36 +00:00
parent 61f7b836f8
commit c8fa1f9553
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/utils/itti_analyzer/libui/ui_notifications.c
+14 -8
View File
@@ -132,7 +132,16 @@ int ui_messages_read(char *filename)
break; break;
} }
if (read_data > 0) if (read_data == 0)
{
break;
}
if (read_data < sizeof(itti_socket_header_t))
{
g_warning("Failed to read a complete message header from file \"%s\": %s", filename, g_strerror (errno));
}
else
{ {
read_fraction += (double) read_data / size; read_fraction += (double) read_data / size;
@@ -145,12 +154,10 @@ int ui_messages_read(char *filename)
{ {
input_data = malloc (input_data_length); input_data = malloc (input_data_length);
if (read (source, input_data, input_data_length) < 0) read_data = read (source, input_data, input_data_length);
if (read_data < input_data_length)
{ {
g_warning("Failed to read from file \"%s\": %s", filename, g_strerror (errno)); g_warning("Failed to read a complete message from file \"%s\": %s", filename, g_strerror (errno));
ui_notification_dialog (GTK_MESSAGE_ERROR, "open messages",
"Failed to read from file \"%s\": %s", filename, g_strerror (errno));
result = RC_FAIL;
break; break;
} }
@@ -231,8 +238,7 @@ int ui_messages_read(char *filename)
ui_progress_bar_terminate (); ui_progress_bar_terminate ();
g_message( g_message("Read %d messages (%d to display) from file \"%s\"\n", read_messages, ui_tree_view_get_filtered_number(), filename);
"Read %d messages (%d to display) from file \"%s\"\n", read_messages, ui_tree_view_get_filtered_number(), filename);
close (source); close (source);
} }