[pkg-wpa-devel] r888 - in /wpasupplicant/branches/upstream/current: src/l2_packet/l2_packet_linux.c src/radius/radius.c wpa_supplicant/Makefile wpa_supplicant/ctrl_iface_dbus.c wpa_supplicant/defconfig
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Fri Nov 9 11:08:00 UTC 2007
Author: kelmo-guest
Date: Fri Nov 9 11:08:00 2007
New Revision: 888
URL: http://svn.debian.org/wsvn/?sc=1&rev=888
Log:
[svn-upgrade] Integrating new upstream version, wpasupplicant (0.6.1~git20071109)
Modified:
wpasupplicant/branches/upstream/current/src/l2_packet/l2_packet_linux.c
wpasupplicant/branches/upstream/current/src/radius/radius.c
wpasupplicant/branches/upstream/current/wpa_supplicant/Makefile
wpasupplicant/branches/upstream/current/wpa_supplicant/ctrl_iface_dbus.c
wpasupplicant/branches/upstream/current/wpa_supplicant/defconfig
Modified: wpasupplicant/branches/upstream/current/src/l2_packet/l2_packet_linux.c
URL: http://svn.debian.org/wsvn/wpasupplicant/branches/upstream/current/src/l2_packet/l2_packet_linux.c?rev=888&op=diff
==============================================================================
--- wpasupplicant/branches/upstream/current/src/l2_packet/l2_packet_linux.c (original)
+++ wpasupplicant/branches/upstream/current/src/l2_packet/l2_packet_linux.c Fri Nov 9 11:08:00 2007
@@ -178,7 +178,8 @@
os_memset(&ifr, 0, sizeof(ifr));
os_strlcpy(ifr.ifr_name, l2->ifname, sizeof(ifr.ifr_name));
if (ioctl(s, SIOCGIFADDR, &ifr) < 0) {
- perror("ioctl[SIOCGIFADDR]");
+ if (errno != EADDRNOTAVAIL)
+ perror("ioctl[SIOCGIFADDR]");
close(s);
return -1;
}
Modified: wpasupplicant/branches/upstream/current/src/radius/radius.c
URL: http://svn.debian.org/wsvn/wpasupplicant/branches/upstream/current/src/radius/radius.c?rev=888&op=diff
==============================================================================
--- wpasupplicant/branches/upstream/current/src/radius/radius.c (original)
+++ wpasupplicant/branches/upstream/current/src/radius/radius.c Fri Nov 9 11:08:00 2007
@@ -234,8 +234,9 @@
case RADIUS_ATTR_IP:
if (len == 4) {
- struct in_addr *addr = (struct in_addr *) pos;
- printf(" Value: %s\n", inet_ntoa(*addr));
+ struct in_addr addr;
+ os_memcpy(&addr, pos, 4);
+ printf(" Value: %s\n", inet_ntoa(addr));
} else
printf(" Invalid IP address length %d\n", len);
break;
Modified: wpasupplicant/branches/upstream/current/wpa_supplicant/Makefile
URL: http://svn.debian.org/wsvn/wpasupplicant/branches/upstream/current/wpa_supplicant/Makefile?rev=888&op=diff
==============================================================================
--- wpasupplicant/branches/upstream/current/wpa_supplicant/Makefile (original)
+++ wpasupplicant/branches/upstream/current/wpa_supplicant/Makefile Fri Nov 9 11:08:00 2007
@@ -757,6 +757,17 @@
ifndef DBUS_INCLUDE
DBUS_INCLUDE := $(shell pkg-config --cflags dbus-1)
endif
+dbus_version=$(subst ., ,$(shell pkg-config --modversion dbus-1))
+DBUS_VERSION_MAJOR=$(word 1,$(dbus_version))
+DBUS_VERSION_MINOR=$(word 2,$(dbus_version))
+ifeq ($(DBUS_VERSION_MAJOR),)
+DBUS_VERSION_MAJOR=0
+endif
+ifeq ($(DBUS_VERSION_MINOR),)
+DBUS_VERSION_MINOR=0
+endif
+DBUS_INCLUDE += -DDBUS_VERSION_MAJOR=$(DBUS_VERSION_MAJOR)
+DBUS_INCLUDE += -DDBUS_VERSION_MINOR=$(DBUS_VERSION_MINOR)
CFLAGS += $(DBUS_INCLUDE)
endif
Modified: wpasupplicant/branches/upstream/current/wpa_supplicant/ctrl_iface_dbus.c
URL: http://svn.debian.org/wsvn/wpasupplicant/branches/upstream/current/wpa_supplicant/ctrl_iface_dbus.c?rev=888&op=diff
==============================================================================
--- wpasupplicant/branches/upstream/current/wpa_supplicant/ctrl_iface_dbus.c (original)
+++ wpasupplicant/branches/upstream/current/wpa_supplicant/ctrl_iface_dbus.c Fri Nov 9 11:08:00 2007
@@ -21,6 +21,14 @@
#include "ctrl_iface_dbus.h"
#include "ctrl_iface_dbus_handlers.h"
+#define DBUS_VERSION (DBUS_VERSION_MAJOR << 8 | DBUS_VERSION_MINOR)
+#define DBUS_VER(major, minor) ((major) << 8 | (minor))
+
+#if DBUS_VERSION < DBUS_VER(1,1)
+#define dbus_watch_get_unix_fd dbus_watch_get_fd
+#endif
+
+
struct ctrl_iface_dbus_priv {
DBusConnection *con;
int should_dispatch;
@@ -83,7 +91,7 @@
return;
flags = dbus_watch_get_flags(watch);
- fd = dbus_watch_get_fd(watch);
+ fd = dbus_watch_get_unix_fd(watch);
eloop_register_sock(fd, EVENT_TYPE_EXCEPTION, process_watch_exception,
iface, watch);
@@ -108,7 +116,7 @@
int fd;
flags = dbus_watch_get_flags(watch);
- fd = dbus_watch_get_fd(watch);
+ fd = dbus_watch_get_unix_fd(watch);
eloop_unregister_sock(fd, EVENT_TYPE_EXCEPTION);
Modified: wpasupplicant/branches/upstream/current/wpa_supplicant/defconfig
URL: http://svn.debian.org/wsvn/wpasupplicant/branches/upstream/current/wpa_supplicant/defconfig?rev=888&op=diff
==============================================================================
--- wpasupplicant/branches/upstream/current/wpa_supplicant/defconfig (original)
+++ wpasupplicant/branches/upstream/current/wpa_supplicant/defconfig Fri Nov 9 11:08:00 2007
@@ -215,7 +215,9 @@
#CONFIG_NO_AES_EXTRAS=y
# Select configuration backend:
-# file = text file (e.g., wpa_supplicant.conf)
+# file = text file (e.g., wpa_supplicant.conf; note: the configuration file
+# path is given on command line, not here; this option is just used to
+# select the backend that allows configuration files to be used)
# winreg = Windows registry (see win_example.reg for an example)
CONFIG_BACKEND=file
More information about the Pkg-wpa-devel
mailing list