Browse Source

wpa_actiond: add new package

tags/milky-way/v0.3
André Silva 1 year ago
parent
commit
190ecdac6e
2 changed files with 106 additions and 0 deletions
  1. +72
    -0
      wpa_actiond/0001-wpa_actiond-Wait-for-three-failed-PONGs-before-disco.patch
  2. +34
    -0
      wpa_actiond/PKGBUILD

+ 72
- 0
wpa_actiond/0001-wpa_actiond-Wait-for-three-failed-PONGs-before-disco.patch View File

@@ -0,0 +1,72 @@
From 8b74c8b3f69e501560e5f0c25cbcbc4aefcbc0ed Mon Sep 17 00:00:00 2001
From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Mon, 21 Aug 2017 11:34:00 +0200
Subject: [PATCH] wpa_actiond: Wait for three "failed" PONGs before
disconnecting

When the system is very low on resources, select() may return 0 even
when wpa_supplicant is alive and kicking.

Don't disconnect as soon at that occurs - wait three times and clearly
log it.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
---
wpa_actiond.c | 11 +++++++++++
1 file changed, 11 insertions(+)

diff --git a/wpa_actiond.c b/wpa_actiond.c
index d60d885..03a9d7f 100644
--- a/wpa_actiond.c
+++ b/wpa_actiond.c
@@ -292,6 +292,7 @@ static void loop(const char *iface, const char *ctrlpath, const int disconnect_t
/* path to control socket */
char *ctrlsock = NULL;
int ctrlsocklen;
+ int pong_failures = 0;
ssid[0] = '\0';
old_ssid[0] = '\0';
@@ -359,6 +360,7 @@ static void loop(const char *iface, const char *ctrlpath, const int disconnect_t
}
logevent(WPA_ACTIOND_LOG_TERMINATE, iface, "");
state = WPA_ACTIOND_STATE_TERMINATED;
+ pong_failures = 0;
break;
case 0:
if (state == WPA_ACTIOND_STATE_CONNECTION_LOST) {
@@ -372,8 +374,15 @@ static void loop(const char *iface, const char *ctrlpath, const int disconnect_t
reply_len = 0;
reply[reply_len] = '\0';
if(!str_match(reply, "PONG")) {
+ if (pong_failures <= 3) {
+ logevent(WPA_ACTIOND_LOG_CUSTOM_ERROR, iface, "wpa_supplicant failed to reply (PONG)");
+ pong_failures++;
+ break;
+ }
+
/* supplicant has been terminated */
if(state == WPA_ACTIOND_STATE_CONNECTED || state == WPA_ACTIOND_STATE_CONNECTION_LOST) {
+ logevent(WPA_ACTIOND_LOG_CUSTOM_ERROR, iface, "wpa_supplicant failed to reply three times in a row - disconnecting");
logevent(WPA_ACTIOND_LOG_DISCONNECTED, iface, ssid);
action(WPA_ACTIOND_ACTION_DISCONNECT, iface, ssid, idstr, wpa_ctrl_get_fd(ctrl), script);
}
@@ -381,6 +390,7 @@ static void loop(const char *iface, const char *ctrlpath, const int disconnect_t
state = WPA_ACTIOND_STATE_TERMINATED;
}
}
+ pong_failures = 0;
break;
default:
/* event received */
@@ -446,6 +456,7 @@ static void loop(const char *iface, const char *ctrlpath, const int disconnect_t
/* we are not interested in this event */
break;
}
+ pong_failures = 0;
}
}
--
2.15.0


+ 34
- 0
wpa_actiond/PKGBUILD View File

@@ -0,0 +1,34 @@
# Maintainer (Arch): Thomas Bächler <thomas@archlinux.org>
# Maintainer: André Silva <emulatorman@hyperbola.info>
pkgname=wpa_actiond
pkgver=1.4
pkgrel=3.hyperbola1
pkgdesc="Daemon that connects to wpa_supplicant and handles connect and disconnect events"
arch=('i686' 'x86_64')
url="https://projects.archlinux.org/wpa_actiond.git/"
license=('GPL-2')
depends=('glibc' 'wpa_supplicant')
source=(https://sources.archlinux.org/other/wpa_actiond/${pkgname}-${pkgver}.tar.xz
https://sources.archlinux.org/other/wpa_actiond/${pkgname}-${pkgver}.tar.xz.sig
0001-wpa_actiond-Wait-for-three-failed-PONGs-before-disco.patch)
sha512sums=('1ac38cdb6ce534cb14cfada4def31c17feff61408868ffd63cd1a516cdbade992719b575a96f5ab4046a1d451bfae526ccdf8eb68cfc7bdc022df3506ae07296'
'SKIP'
'928bd9935549ffcde22679a6486e6c71633cfa66205be6f634d61e0c42ca64eb1db88eccb5499b5d6eda57ccabf4eeb1ac6ef510f1f14ec0bd3162fa4f530af2')
validpgpkeys=('A314827C4E4250A204CE6E13284FC34C8E4B1A25') # Thomas Bächler

prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p1 -i "${srcdir}/0001-wpa_actiond-Wait-for-three-failed-PONGs-before-disco.patch"
}

build() {
cd "${srcdir}/${pkgname}-${pkgver}"
make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
}

package() {
cd "${srcdir}/${pkgname}-${pkgver}"
install -D -m755 wpa_actiond "${pkgdir}/usr/bin/wpa_actiond"
install -D -m644 COPYING "${pkgdir}/usr/share/licenses/wpa_actiond/COPYING"
}
# vim:set ts=2 sw=2 et:

Loading…
Cancel
Save