diff mbox

[2/3] mesh: Add debug message when peer is too much

Message ID 1418968794-12663-2-git-send-email-masashi.honma@gmail.com
State Superseded
Headers show

Commit Message

Masashi Honma Dec. 19, 2014, 5:59 a.m. UTC 
Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
---
 wpa_supplicant/mesh_mpm.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

Comments

Bob Copeland Dec. 19, 2014, 3 p.m. UTC | #1 
On Fri, Dec 19, 2014 at 02:59:53PM +0900, Masashi Honma wrote:
>  	case PLINK_CONFIRM:
> -		if (!plink_free_count(hapd) ||
> -		    sta->my_lid != llid ||
> -		    (sta->peer_lid && sta->peer_lid != plid)) {
> +		if (plink_free_count(hapd) == 0) {
> +			event = OPN_IGNR;

should be CNF_IGNR in this case?

> +			wpa_printf(MSG_WARNING, "MPM: Peer link num over quota(%d)",
> +				   hapd->max_plinks);
> +		} else if (sta->my_lid != llid ||
> +			   (sta->peer_lid && sta->peer_lid != plid)) {
>  			event = CNF_IGNR;
>  		} else {
>  			if (!sta->peer_lid)
> -- 
> 1.9.1
> 
> _______________________________________________
> HostAP mailing list
> HostAP@lists.shmoo.com
> http://lists.shmoo.com/mailman/listinfo/hostap
Masashi Honma Dec. 19, 2014, 3:13 p.m. UTC | #2 
On 2014年12月20日 00:00, Bob Copeland wrote:
> should be CNF_IGNR in this case?
Yes. Thank you.
diff mbox

Patch

diff --git a/wpa_supplicant/mesh_mpm.c b/wpa_supplicant/mesh_mpm.c
index 3b931f8..de1d24d 100644
--- a/wpa_supplicant/mesh_mpm.c
+++ b/wpa_supplicant/mesh_mpm.c
@@ -938,8 +938,11 @@  void mesh_mpm_action_rx(struct wpa_supplicant *wpa_s,
 	/* Now we will figure out the appropriate event... */
 	switch (action_field) {
 	case PLINK_OPEN:
-		if (!plink_free_count(hapd) ||
-		    (sta->peer_lid && sta->peer_lid != plid)) {
+		if (plink_free_count(hapd) == 0) {
+			event = OPN_IGNR;
+			wpa_printf(MSG_WARNING, "MPM: Peer link num over quota(%d)",
+				   hapd->max_plinks);
+		} else if (sta->peer_lid && sta->peer_lid != plid) {
 			event = OPN_IGNR;
 		} else {
 			sta->peer_lid = plid;
@@ -947,9 +950,12 @@  void mesh_mpm_action_rx(struct wpa_supplicant *wpa_s,
 		}
 		break;
 	case PLINK_CONFIRM:
-		if (!plink_free_count(hapd) ||
-		    sta->my_lid != llid ||
-		    (sta->peer_lid && sta->peer_lid != plid)) {
+		if (plink_free_count(hapd) == 0) {
+			event = OPN_IGNR;
+			wpa_printf(MSG_WARNING, "MPM: Peer link num over quota(%d)",
+				   hapd->max_plinks);
+		} else if (sta->my_lid != llid ||
+			   (sta->peer_lid && sta->peer_lid != plid)) {
 			event = CNF_IGNR;
 		} else {
 			if (!sta->peer_lid)