diff options
author | Jouni Malinen <jouni.malinen@atheros.com> | 2010-02-15 05:53:10 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-02-15 16:14:15 -0500 |
commit | 026331c4d9b526561ea96f95fac4bfc52b69e316 (patch) | |
tree | a82b0a92a7f03a1d151a9db123320689c73d98c7 /net/wireless/mlme.c | |
parent | 8404080568613d93ad7cf0a16dfb68459b42a264 (diff) |
cfg80211/mac80211: allow registering for and sending action frames
This implements a new command to register for action frames
that userspace wants to handle instead of the in-kernel
rejection. It is then responsible for rejecting ones that
it decided not to handle. There is no unregistration, but
the socket can be closed for that.
Frames that are not registered for will not be forwarded
to userspace and will be rejected by the kernel, the
cfg80211 API helps implementing that.
Additionally, this patch adds a new command that allows
doing action frame transmission from userspace. It can be
used either to exchange action frames on the current
operational channel (e.g., with the AP with which we are
currently associated) or to exchange off-channel Public
Action frames with the remain-on-channel command.
Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/mlme.c')
-rw-r--r-- | net/wireless/mlme.c | 166 |
1 files changed, 166 insertions, 0 deletions
diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c index 94d151f6f73e..62bc8855e123 100644 --- a/net/wireless/mlme.c +++ b/net/wireless/mlme.c | |||
@@ -728,3 +728,169 @@ void cfg80211_new_sta(struct net_device *dev, const u8 *mac_addr, | |||
728 | nl80211_send_sta_event(rdev, dev, mac_addr, sinfo, gfp); | 728 | nl80211_send_sta_event(rdev, dev, mac_addr, sinfo, gfp); |
729 | } | 729 | } |
730 | EXPORT_SYMBOL(cfg80211_new_sta); | 730 | EXPORT_SYMBOL(cfg80211_new_sta); |
731 | |||
732 | struct cfg80211_action_registration { | ||
733 | struct list_head list; | ||
734 | |||
735 | u32 nlpid; | ||
736 | |||
737 | int match_len; | ||
738 | |||
739 | u8 match[]; | ||
740 | }; | ||
741 | |||
742 | int cfg80211_mlme_register_action(struct wireless_dev *wdev, u32 snd_pid, | ||
743 | const u8 *match_data, int match_len) | ||
744 | { | ||
745 | struct cfg80211_action_registration *reg, *nreg; | ||
746 | int err = 0; | ||
747 | |||
748 | nreg = kzalloc(sizeof(*reg) + match_len, GFP_KERNEL); | ||
749 | if (!nreg) | ||
750 | return -ENOMEM; | ||
751 | |||
752 | spin_lock_bh(&wdev->action_registrations_lock); | ||
753 | |||
754 | list_for_each_entry(reg, &wdev->action_registrations, list) { | ||
755 | int mlen = min(match_len, reg->match_len); | ||
756 | |||
757 | if (memcmp(reg->match, match_data, mlen) == 0) { | ||
758 | err = -EALREADY; | ||
759 | break; | ||
760 | } | ||
761 | } | ||
762 | |||
763 | if (err) { | ||
764 | kfree(nreg); | ||
765 | goto out; | ||
766 | } | ||
767 | |||
768 | memcpy(nreg->match, match_data, match_len); | ||
769 | nreg->match_len = match_len; | ||
770 | nreg->nlpid = snd_pid; | ||
771 | list_add(&nreg->list, &wdev->action_registrations); | ||
772 | |||
773 | out: | ||
774 | spin_unlock_bh(&wdev->action_registrations_lock); | ||
775 | return err; | ||
776 | } | ||
777 | |||
778 | void cfg80211_mlme_unregister_actions(struct wireless_dev *wdev, u32 nlpid) | ||
779 | { | ||
780 | struct cfg80211_action_registration *reg, *tmp; | ||
781 | |||
782 | spin_lock_bh(&wdev->action_registrations_lock); | ||
783 | |||
784 | list_for_each_entry_safe(reg, tmp, &wdev->action_registrations, list) { | ||
785 | if (reg->nlpid == nlpid) { | ||
786 | list_del(®->list); | ||
787 | kfree(reg); | ||
788 | } | ||
789 | } | ||
790 | |||
791 | spin_unlock_bh(&wdev->action_registrations_lock); | ||
792 | } | ||
793 | |||
794 | void cfg80211_mlme_purge_actions(struct wireless_dev *wdev) | ||
795 | { | ||
796 | struct cfg80211_action_registration *reg, *tmp; | ||
797 | |||
798 | spin_lock_bh(&wdev->action_registrations_lock); | ||
799 | |||
800 | list_for_each_entry_safe(reg, tmp, &wdev->action_registrations, list) { | ||
801 | list_del(®->list); | ||
802 | kfree(reg); | ||
803 | } | ||
804 | |||
805 | spin_unlock_bh(&wdev->action_registrations_lock); | ||
806 | } | ||
807 | |||
808 | int cfg80211_mlme_action(struct cfg80211_registered_device *rdev, | ||
809 | struct net_device *dev, | ||
810 | struct ieee80211_channel *chan, | ||
811 | enum nl80211_channel_type channel_type, | ||
812 | const u8 *buf, size_t len, u64 *cookie) | ||
813 | { | ||
814 | struct wireless_dev *wdev = dev->ieee80211_ptr; | ||
815 | const struct ieee80211_mgmt *mgmt; | ||
816 | |||
817 | if (rdev->ops->action == NULL) | ||
818 | return -EOPNOTSUPP; | ||
819 | if (len < 24 + 1) | ||
820 | return -EINVAL; | ||
821 | |||
822 | mgmt = (const struct ieee80211_mgmt *) buf; | ||
823 | if (!ieee80211_is_action(mgmt->frame_control)) | ||
824 | return -EINVAL; | ||
825 | if (mgmt->u.action.category != WLAN_CATEGORY_PUBLIC) { | ||
826 | /* Verify that we are associated with the destination AP */ | ||
827 | if (!wdev->current_bss || | ||
828 | memcmp(wdev->current_bss->pub.bssid, mgmt->bssid, | ||
829 | ETH_ALEN) != 0 || | ||
830 | memcmp(wdev->current_bss->pub.bssid, mgmt->da, | ||
831 | ETH_ALEN) != 0) | ||
832 | return -ENOTCONN; | ||
833 | } | ||
834 | |||
835 | if (memcmp(mgmt->sa, dev->dev_addr, ETH_ALEN) != 0) | ||
836 | return -EINVAL; | ||
837 | |||
838 | /* Transmit the Action frame as requested by user space */ | ||
839 | return rdev->ops->action(&rdev->wiphy, dev, chan, channel_type, | ||
840 | buf, len, cookie); | ||
841 | } | ||
842 | |||
843 | bool cfg80211_rx_action(struct net_device *dev, int freq, const u8 *buf, | ||
844 | size_t len, gfp_t gfp) | ||
845 | { | ||
846 | struct wireless_dev *wdev = dev->ieee80211_ptr; | ||
847 | struct wiphy *wiphy = wdev->wiphy; | ||
848 | struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy); | ||
849 | struct cfg80211_action_registration *reg; | ||
850 | const u8 *action_data; | ||
851 | int action_data_len; | ||
852 | bool result = false; | ||
853 | |||
854 | /* frame length - min size excluding category */ | ||
855 | action_data_len = len - (IEEE80211_MIN_ACTION_SIZE - 1); | ||
856 | |||
857 | /* action data starts with category */ | ||
858 | action_data = buf + IEEE80211_MIN_ACTION_SIZE - 1; | ||
859 | |||
860 | spin_lock_bh(&wdev->action_registrations_lock); | ||
861 | |||
862 | list_for_each_entry(reg, &wdev->action_registrations, list) { | ||
863 | if (reg->match_len > action_data_len) | ||
864 | continue; | ||
865 | |||
866 | if (memcmp(reg->match, action_data, reg->match_len)) | ||
867 | continue; | ||
868 | |||
869 | /* found match! */ | ||
870 | |||
871 | /* Indicate the received Action frame to user space */ | ||
872 | if (nl80211_send_action(rdev, dev, reg->nlpid, freq, | ||
873 | buf, len, gfp)) | ||
874 | continue; | ||
875 | |||
876 | result = true; | ||
877 | break; | ||
878 | } | ||
879 | |||
880 | spin_unlock_bh(&wdev->action_registrations_lock); | ||
881 | |||
882 | return result; | ||
883 | } | ||
884 | EXPORT_SYMBOL(cfg80211_rx_action); | ||
885 | |||
886 | void cfg80211_action_tx_status(struct net_device *dev, u64 cookie, | ||
887 | const u8 *buf, size_t len, bool ack, gfp_t gfp) | ||
888 | { | ||
889 | struct wireless_dev *wdev = dev->ieee80211_ptr; | ||
890 | struct wiphy *wiphy = wdev->wiphy; | ||
891 | struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy); | ||
892 | |||
893 | /* Indicate TX status of the Action frame to user space */ | ||
894 | nl80211_send_action_tx_status(rdev, dev, cookie, buf, len, ack, gfp); | ||
895 | } | ||
896 | EXPORT_SYMBOL(cfg80211_action_tx_status); | ||