[aravis] gv_interface,fake_gv: fix mistake in new_from_native calls.



commit fa296ee05535af2f202abc06d257f4a14138d37e
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Fri Aug 20 17:23:21 2010 +0200

    gv_interface,fake_gv: fix mistake in new_from_native calls.
    
    The len parameters was not given correctly.

 src/arvfakegvcamera.c |    4 ++--
 src/arvgvinterface.c  |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/arvfakegvcamera.c b/src/arvfakegvcamera.c
index 38d378b..5bb1bd6 100644
--- a/src/arvfakegvcamera.c
+++ b/src/arvfakegvcamera.c
@@ -218,7 +218,7 @@ arv_fake_gv_camera_new (const char *interface_name)
 			char *gvcp_address_string;
 			char *discovery_address_string;
 
-			socket_address = g_socket_address_new_from_native (ifap->ifa_addr, sizeof (ifap->ifa_addr));
+			socket_address = g_socket_address_new_from_native (ifap->ifa_addr, sizeof (struct sockaddr));
 			inet_address = g_inet_socket_address_get_address (G_INET_SOCKET_ADDRESS (socket_address));
 			gvcp_address_string = g_inet_address_to_string (inet_address);
 			arv_debug ("camera", "[FakeGvCamera::new] Interface address = %s", gvcp_address_string);
@@ -244,7 +244,7 @@ arv_fake_gv_camera_new (const char *interface_name)
 			g_object_unref (socket_address);
 
 			socket_address = g_socket_address_new_from_native (ifap->ifa_broadaddr,
-									   sizeof (ifap->ifa_broadaddr));
+									   sizeof (struct sockaddr));
 			inet_address = g_inet_socket_address_get_address (G_INET_SOCKET_ADDRESS (socket_address));
 			discovery_address_string = g_inet_address_to_string (inet_address);
 			arv_debug ("camera", "[FakeGvCamera::new] Discovery address = %s", discovery_address_string);
diff --git a/src/arvgvinterface.c b/src/arvgvinterface.c
index 1876d7e..1ce4a64 100644
--- a/src/arvgvinterface.c
+++ b/src/arvgvinterface.c
@@ -123,7 +123,7 @@ arv_gv_interface_build_discover_infos_list (ArvGvInterface *gv_interface)
 			char *inet_address_string;
 			GError *error = NULL;
 
-			socket_address = g_socket_address_new_from_native (ifap->ifa_addr, sizeof (ifap->ifa_addr));
+			socket_address = g_socket_address_new_from_native (ifap->ifa_addr, sizeof (struct sockaddr));
 			inet_address = g_inet_socket_address_get_address (G_INET_SOCKET_ADDRESS (socket_address));
 			inet_address_string = g_inet_address_to_string (inet_address);
 			arv_debug ("interface", "[GvInterface::build_discover_infos_list] Add interface %s",
@@ -133,7 +133,7 @@ arv_gv_interface_build_discover_infos_list (ArvGvInterface *gv_interface)
 			g_object_unref (socket_address);
 
 			socket_address = g_socket_address_new_from_native (ifap->ifa_broadaddr,
-									   sizeof (ifap->ifa_broadaddr));
+									   sizeof (struct sockaddr));
 			inet_address = g_inet_socket_address_get_address (G_INET_SOCKET_ADDRESS (socket_address));
 			infos->broadcast_address = g_inet_socket_address_new (inet_address, ARV_GVCP_PORT);
 			inet_address_string = g_inet_address_to_string (inet_address);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]