On Tue, 2007-03-20 at 10:39 +0000, andy@xxxxxxxxxxx wrote:
> --- a/net/mac80211/ieee80211.c
> +++ b/net/mac80211/ieee80211.c
> @@ -1054,7 +1054,180 @@ ieee80211_tx_h_ps_buf(struct ieee80211_txrx_data *tx)
> }
>
>
> -static void inline
> +/* deal with packet injection down monitor interface
> + * with Radiotap Header -- only called for monitor mode interface
> + */
> +
> +static ieee80211_txrx_result
> +__ieee80211_convert_radiotap_to_control_and_remove(
> + struct ieee80211_txrx_data *tx,
> + struct sk_buff *skb, struct ieee80211_tx_control *control)
> +{
The actual parsing should live in cfg80211 (preferably in a new file) so
that others can use it. If it's a lot of code then add a new invisible
Kconfig symbol for it that drivers/stacks can select.
> + * There is also some pervacious arg padding, so that args
perwhat?
> + static const u8 radiotap_entry_sizes[] = {
> + 8, /* IEEE80211_RADIOTAP_TSFT */
> + 1, /* IEEE80211_RADIOTAP_FLAGS */
[...]
I'd prefer C99 style for this.
> + return TXRX_DROP; /* version byte as magic */
Bad idea. At least the comment. If you mean "drop the packet if it has a
radiotap version we don't parse" then say so.
> + if (le32_to_cpu(rthdr->it_present) & 0x80000000) {
> + while (le32_to_cpu(*((u32 *)tap_arg)) & 0x80000000)
Use a constant for that, introduce one if necessary.
> + control->key_idx = -1; /* no encryption key */
Is there any way to indicate encryption? I think there might need to be
for 802.11w.
> + control->flags &= ~(IEEE80211_TXCTL_USE_RTS_CTS |
> + IEEE80211_TXCTL_USE_CTS_PROTECT);
These really should be selectable as well.
> + control->flags |= (IEEE80211_TXCTL_DO_NOT_ENCRYPT |
> + IEEE80211_TXCTL_NO_ACK);
And NO_ACK is a really really totally bad idea for a userspace MLME.
Needs to be selectable for sure.
We also need to be able to assign some magic cookie to a packet that we
get back along with the packet so that we know when the injected packet
has been acked by the peer.
> + /* remove the radiotap header */
> + skb_pull(skb, le16_to_cpu(rthdr->it_len));
Shouldn't there be some sort of sanity check here so we don't pull too
much if userspace asks us to?
> + /* radiotap version used as magic */
Same comment as above, there's nothing magic about the radiotap version.
johannes
Attachment:
signature.asc
Description: This is a digitally signed message part
