fixed more warnings - hcxdumptool should now compile fine by clang

Author: =

hcxdumptool.c

@@ -1439,45 +1439,6 @@ errortxcount++;
 return;
 }
 /*---------------------------------------------------------------------------*/
-static inline __attribute__((always_inline)) void send_80211_associationrequest2rg(apdata_t *apdata)
-{
-ssize_t ii;
-
-ii = RTHTX_SIZE;
-macftx = (ieee80211_mac_t*)&wltxbuffer[ii];
-macftx->type = IEEE80211_FTYPE_MGMT;
-macftx->subtype = IEEE80211_STYPE_ASSOC_REQ;
-wltxbuffer[ii + 1] = 0;
-macftx->duration = HCXTXDURATION;
-memcpy(macftx->addr1, apdata->maca, ETH_ALEN);
-memcpy(macftx->addr2, macclientrg, ETH_ALEN);
-memcpy(macftx->addr3, apdata->maca, ETH_ALEN);
-macftx->sequence = __hcx16le(seqcounter2++ << 4);
-if(seqcounter1 > 4095) seqcounter2 = 1;
-ii += MAC_SIZE_NORM;
-memcpy(&wltxbuffer[ii], &associationrequestcapa, ASSOCIATIONREQUESTCAPA_SIZE);
-ii += ASSOCIATIONREQUESTCAPA_SIZE;
-wltxbuffer[ii ++] = 0;
-wltxbuffer[ii ++] = apdata->essidlen;
-memcpy(&wltxbuffer[ii], apdata->essid, apdata->essidlen);
-ii += apdata->essidlen;
-memcpy(&wltxbuffer[ii], &associationrequestdata, ASSOCIATIONREQUEST_SIZE);
-wltxbuffer[ii +OFFSETGCS] = apdata->gcs;
-wltxbuffer[ii +OFFSETPCS] = apdata->pcs;
-wltxbuffer[ii +OFFSETAKM] = apdata->akm;
-ii += ASSOCIATIONREQUEST_SIZE;
-if((write(fd_socket_tx, &wltxbuffer, ii)) == ii)
-	{
-	errortxcount = 0;
-	return;
-	}
-#ifdef HCXDEBUG
-fprintf(fh_debug, "write associationrequest failed: %s\n", strerror(errno));
-#endif
-errortxcount++;
-return;
-}
-/*---------------------------------------------------------------------------*/
 static inline __attribute__((always_inline)) void send_80211_associationrequest2(apdata_t *apdata)
 {
 ssize_t ii;
@@ -1542,57 +1503,6 @@ errortxcount++;
 return;
 }
 /*---------------------------------------------------------------------------*/
-static inline __attribute__((always_inline)) void send_80211_authenticationrequestrg(void)
-{
-macftx = (ieee80211_mac_t*)&wltxbuffer[RTHTX_SIZE];
-macftx->type = IEEE80211_FTYPE_MGMT;
-macftx->subtype = IEEE80211_STYPE_AUTH;
-wltxbuffer[RTHTX_SIZE + 1] = 0;
-macftx->duration = HCXTXDURATION;
-memcpy(macftx->addr1, macfrx->addr2, ETH_ALEN);
-memcpy(macftx->addr2, macclientrg, ETH_ALEN);
-memcpy(macftx->addr3, macfrx->addr3, ETH_ALEN);
-macftx->sequence = __hcx16le(seqcounter2++ << 4);
-if(seqcounter1 > 4095) seqcounter2 = 1;
-memcpy(&wltxbuffer[RTHTX_SIZE + MAC_SIZE_NORM], &authenticationrequestdata, AUTHENTICATIONREQUEST_SIZE);
-if((write(fd_socket_tx, &wltxbuffer, RTHTX_SIZE + MAC_SIZE_NORM + AUTHENTICATIONREQUEST_SIZE)) == RTHTX_SIZE + MAC_SIZE_NORM + AUTHENTICATIONREQUEST_SIZE)
-	{
-	errortxcount = 0;
-	return;
-	}
-#ifdef HCXDEBUG
-fprintf(fh_debug, "write_80211_authenticationrequest failed: %s\n", strerror(errno));
-#endif
-errortxcount++;
-return;
-}
-/*---------------------------------------------------------------------------*/
-static inline __attribute__((always_inline)) void send_80211_disassociationaca(u8 *fmcl, u8 *toap)
-{
-macftx = (ieee80211_mac_t*)&wltxbuffer[RTHTX_SIZE];
-macftx->type = IEEE80211_FTYPE_MGMT;
-macftx->subtype = IEEE80211_STYPE_DISASSOC;
-wltxbuffer[RTHTX_SIZE +1] = 0;
-macftx->duration = HCXTXDURATION;
-memcpy(macftx->addr1, toap, ETH_ALEN);
-memcpy(macftx->addr2, fmcl, ETH_ALEN);
-memcpy(macftx->addr3, toap, ETH_ALEN);
-macftx->sequence = __hcx16le(seqcounter1++ << 4);
-if(seqcounter1 > BCD_MAX) seqcounter1 = 1;
-wltxbuffer[RTHTX_SIZE + MAC_SIZE_NORM] = WLAN_REASON_DISASSOC_STA_HAS_LEFT;
-wltxbuffer[RTHTX_SIZE + MAC_SIZE_NORM +1] = 0;
-if((write(fd_socket_tx, wltxbuffer, RTHTX_SIZE + MAC_SIZE_NORM +2)) == RTHTX_SIZE + MAC_SIZE_NORM +2)
-	{
-	errortxcount = 0;
-	return;
-	}
-#ifdef HCXDEBUG
-fprintf(fh_debug, "write_80211_disassociation121 failed: %s\n", strerror(errno));
-#endif
-errortxcount++;
-return;
-}
-/*---------------------------------------------------------------------------*/
 static inline __attribute__((always_inline)) void send_80211_disassociationcaa(u8 *tocl, u8 *fmap)
 {
 macftx = (ieee80211_mac_t*)&wltxbuffer[RTHTX_SIZE];
@@ -3553,146 +3463,6 @@ while(nla_ok(pos, nestremlen))
 return 0;
 }
 /*---------------------------------------------------------------------------*/
-/*
-Linux Generic Netlink protocol
-    Netlink message header (type: 0x0025)
-    Command: NL80211_CMD_NEW_INTERFACE (7)
-    Family Version: 0
-    Reserved
-Linux 802.11 Netlink
-    Attribute: NL80211_ATTR_WIPHY
-        Len: 8
-        Type: 0x0001, NL80211_ATTR_WIPHY (1)
-        Attribute Value: 0x00000003 (3)
-    Attribute: NL80211_ATTR_IFNAME
-        Len: 12
-        Type: 0x0004, NL80211_ATTR_IFNAME (4)
-        Interface Name: hcxmon0
-    Attribute: NL80211_ATTR_IFTYPE
-        Len: 8
-        Type: 0x0005, NL80211_ATTR_IFTYPE (5)
-        Attribute Type: NL80211_IFTYPE_MONITOR (6)
-*/
-
-static inline bool nl_set_interface(void)
-{
-static size_t ii;
-static ssize_t i;
-static ssize_t msglen;
-static int nlremlen = 0;
-static struct nlmsghdr *nlh;
-static struct genlmsghdr *glh;
-static struct nlattr *nla;
-static struct nlmsgerr *nle;
-static u32 *wiphytmp;
-static u64 *wdevtmp;
-static u32 *ifidxtmp;
-static u8 *vimactmp;
-static char *ifnametmp;
-
-i = 0;
-nlh = (struct nlmsghdr*)nltxbuffer;
-nlh->nlmsg_type = nlfamily;
-nlh->nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK;
-nlh->nlmsg_seq = nlseqcounter++;
-nlh->nlmsg_pid = hcxpid;
-i += sizeof(struct nlmsghdr);
-glh = (struct genlmsghdr*)(nltxbuffer + i);
-glh->cmd = NL80211_CMD_NEW_INTERFACE;
-glh->version = 1;
-glh->reserved = 0;
-i += sizeof(struct genlmsghdr);
-nla = (struct nlattr*)(nltxbuffer + i);
-nla->nla_len = 8;
-
-nla->nla_type = NL80211_ATTR_WIPHY;
-//*(u32*)nla_data(nla) = phyindex;
-i += 8;
-nla = (struct nlattr*)(nltxbuffer + i);
-nla->nla_len = 8;
-
-nla->nla_type = NL80211_ATTR_IFNAME;
-//memcpy(nla_data(nla), hcxname, hcxnamelen);
-i += 8;
-nla = (struct nlattr*)(nltxbuffer + i);
-nla->nla_len = 8;
-
-
-nla->nla_type = NL80211_ATTR_IFTYPE;
-*(u32*)nla_data(nla) = NL80211_IFTYPE_MONITOR;
-i += 8;
-if(((ifakttype & IFTYPEMONACT) == IFTYPEMONACT) && (activemonitorflag == true))
-	{
-	nla = (struct nlattr*)(nltxbuffer + i);
-	nla->nla_len = 8;
-	nla->nla_type = NL80211_ATTR_MNTR_FLAGS;
-	nla = (struct nlattr*)nla_data(nla);
-	nla->nla_len = 4;
-	nla->nla_type = NL80211_MNTR_FLAG_ACTIVE;
-	i += 8;
-	}
-nlh->nlmsg_len = i;
-if((write(fd_socket_nl, nltxbuffer, i)) != i) return false;
-
-while(1)
-	{
-	msglen = read(fd_socket_nl, &nlrxbuffer, NLRX_SIZE);
-	if(msglen == -1) break;
-	if(msglen == 0) break;
-	wiphytmp = NULL;
-	wdevtmp = NULL;
-	ifidxtmp = NULL;;
-	vimactmp = NULL;;
-	ifnametmp = NULL;
-	for(nlh = (struct nlmsghdr*)nlrxbuffer; NLMSG_OK(nlh, (u32)msglen); nlh = NLMSG_NEXT(nlh, msglen))
-		{
-		if(nlh->nlmsg_type == NLMSG_DONE) return true;
-		if(nlh->nlmsg_type == NLMSG_ERROR)
-			{
-			nle = (struct nlmsgerr*)(nlrxbuffer + sizeof(struct nlmsghdr));
-			if(nle->error == 0) return true;
-			errorcount++;
-			nlfamily = 0;
-			return false;
-			}
-		glh = (struct genlmsghdr*)NLMSG_DATA(nlh);
-		if(glh->cmd != NL80211_CMD_NEW_INTERFACE) continue;
-		nla = (struct nlattr*)((unsigned char*)NLMSG_DATA(nlh) + sizeof(struct genlmsghdr));
-		nlremlen = NLMSG_PAYLOAD(nlh, 0) -4;
-		while(nla_ok(nla, nlremlen))
-			{
-			if(nla->nla_type == NL80211_ATTR_WDEV) wdevtmp = nla_data(nla);
-			if(nla->nla_type == NL80211_ATTR_IFINDEX) ifidxtmp = nla_data(nla);
-			if(nla->nla_type == NL80211_ATTR_IFNAME) ifnametmp = nla_data(nla);
-			if(nla->nla_type == NL80211_ATTR_WIPHY) wiphytmp = nla_data(nla);
-			if(nla->nla_type == NL80211_ATTR_MAC)
-				{
-				if(nla->nla_len == 10) vimactmp = nla_data(nla);
-				}
-			nla = nla_next(nla, &nlremlen);
-			}
-		for(ii = 0; ii < ifpresentlistcounter; ii++)
-			{
-			if((ifpresentlist + ii)->wiphy == *(int*)wiphytmp)
-				{
-				if(ifidxtmp != NULL) (ifpresentlist + ii)->index = *(u32*)ifidxtmp;
-				if(wdevtmp != NULL)
-					{
-					if((ifpresentlist + ii)->wdev != 0)
-						{
-						if((ifpresentlist + ii)->wdev != *(u64*)wdevtmp) (ifpresentlist + ii)->type |= IF_IS_SHARED;
-						}
-					(ifpresentlist + ii)->wdev = *(u64*)wdevtmp;
-					}
-				if(vimactmp != NULL)memcpy((ifpresentlist + ii)->vimac, vimactmp, ETH_ALEN);
-				if(ifnametmp != NULL)strncpy((ifpresentlist + ii)->name, ifnametmp, IF_NAMESIZE);
-				}
-			}
-		}
-	}
-return false;
-}
-/*---------------------------------------------------------------------------*/
 static bool nl_get_interfacelist(void)
 {
 static size_t ii;