Diffstat (limited to 'noncore/net/wellenreiter/libwellenreiter/source/sniff.cc') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/libwellenreiter/source/sniff.cc | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc b/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc index 84caf12..c703052 100644 --- a/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc +++ b/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc | |||
@@ -73,88 +73,83 @@ void process_packets(const struct pcap_pkthdr *pkthdr, const unsigned char *pack | |||
73 | { | 73 | { |
74 | if (!strcmp(pinfoptr->desthwaddr,"ff:ff:ff:ff:ff:ff") == 0) | 74 | if (!strcmp(pinfoptr->desthwaddr,"ff:ff:ff:ff:ff:ff") == 0) |
75 | { | 75 | { |
76 | /* Every beacon must have the broadcast as destination | 76 | /* Every beacon must have the broadcast as destination |
77 | so it must be a shitti packet */ | 77 | so it must be a shitti packet */ |
78 | pinfoptr->isvalid = 0; | 78 | pinfoptr->isvalid = 0; |
79 | return; | 79 | return; |
80 | } | 80 | } |
81 | 81 | ||
82 | if (pinfoptr->cap_ESS == pinfoptr->cap_IBSS) | 82 | if (pinfoptr->cap_ESS == pinfoptr->cap_IBSS) |
83 | { | 83 | { |
84 | /* Only one of both are possible, so must be | 84 | /* Only one of both are possible, so must be |
85 | a noise packet, if this comes up */ | 85 | a noise packet, if this comes up */ |
86 | pinfoptr->isvalid = 0; | 86 | pinfoptr->isvalid = 0; |
87 | return; | 87 | return; |
88 | } | 88 | } |
89 | if (pinfoptr->channel < 1 || pinfoptr->channel > 14) | 89 | if (pinfoptr->channel < 1 || pinfoptr->channel > 14) |
90 | { | 90 | { |
91 | /* Only channels between 1 and 14 are possible | 91 | /* Only channels between 1 and 14 are possible |
92 | others must be noise packets */ | 92 | others must be noise packets */ |
93 | pinfoptr->isvalid = 0; | 93 | pinfoptr->isvalid = 0; |
94 | return; | 94 | return; |
95 | } | 95 | } |
96 | 96 | ||
97 | printf( "cap_ESS is %d, cap_IBSS is %d\n", pinfoptr->cap_ESS, pinfoptr->cap_IBSS ); | ||
98 | |||
99 | /* Here should be the infos to the gui issued */ | 97 | /* Here should be the infos to the gui issued */ |
100 | if (pinfoptr->cap_ESS == 1 &&pinfoptr->cap_IBSS ==0) | 98 | if (pinfoptr->cap_ESS == 1 &&pinfoptr->cap_IBSS ==0) |
101 | { | 99 | { |
102 | wl_loginfo("Found an access point"); | 100 | wl_loginfo("Found an access point"); |
103 | wl_net.net_type=1; | 101 | wl_net.net_type=1; |
104 | } | 102 | } |
105 | else if(pinfoptr->cap_ESS == 0 && pinfoptr->cap_IBSS == 2) | 103 | else if(pinfoptr->cap_ESS == 0 && pinfoptr->cap_IBSS == 2) |
106 | { | 104 | { |
107 | wl_loginfo("Found an ad-hoc network"); | 105 | wl_loginfo("Found an ad-hoc network"); |
108 | wl_net.net_type=2; | 106 | wl_net.net_type=2; |
109 | } | 107 | } |
108 | |||
110 | if (strcmp (pinfoptr->ssid,NONBROADCASTING) ==0) | 109 | if (strcmp (pinfoptr->ssid,NONBROADCASTING) ==0) |
111 | { | ||
112 | wl_loginfo("Net is a non-broadcasting network"); | 110 | wl_loginfo("Net is a non-broadcasting network"); |
113 | } | ||
114 | else | 111 | else |
115 | { | ||
116 | wl_loginfo("SSID is: %s", pinfoptr->ssid); | 112 | wl_loginfo("SSID is: %s", pinfoptr->ssid); |
117 | // wl_net.bssid=pinfoptr->ssid; | 113 | |
118 | } | 114 | wl_loginfo("SSID is: %s", pinfoptr->ssid); |
115 | memcpy(wl_net.bssid, pinfoptr->ssid, sizeof(wl_net.bssid)-1); | ||
119 | 116 | ||
120 | wl_loginfo("SSID length is: %d", pinfoptr->ssid_len); | 117 | wl_loginfo("SSID length is: %d", pinfoptr->ssid_len); |
121 | wl_net.ssid_len=pinfoptr->ssid_len; | 118 | wl_net.ssid_len=pinfoptr->ssid_len; |
122 | 119 | ||
123 | wl_loginfo("Channel is: %d", pinfoptr->channel); | 120 | wl_loginfo("Channel is: %d", pinfoptr->channel); |
124 | wl_net.channel=pinfoptr->channel; | 121 | wl_net.channel=pinfoptr->channel; |
125 | wl_net.wep=pinfoptr->cap_WEP; | 122 | wl_net.wep=pinfoptr->cap_WEP; |
126 | 123 | ||
127 | wl_loginfo("Mac is: %s", pinfoptr->sndhwaddr); | 124 | wl_loginfo("Mac is: %s", pinfoptr->sndhwaddr); |
128 | memcpy(wl_net.mac, pinfoptr->sndhwaddr, sizeof(wl_net.mac)-1);; | 125 | memcpy(wl_net.mac, pinfoptr->sndhwaddr, sizeof(wl_net.mac)-1);; |
129 | wl_loginfo("SSID is: %s", pinfoptr->ssid); | 126 | |
130 | memcpy(wl_net.bssid, pinfoptr->ssid, sizeof(wl_net.bssid)-1); | ||
131 | |||
132 | // printf ("\n\tDest : %s\n",pinfoptr->desthwaddr); | ||
133 | send_network_found((char *)guihost, guiport, &wl_net); | 127 | send_network_found((char *)guihost, guiport, &wl_net); |
134 | wl_loginfo("Sent network to GUI '%s:%d'", guihost, guiport); | 128 | wl_loginfo("Sent network to GUI '%s:%d'", guihost, guiport); |
135 | } | 129 | } |
136 | break; | 130 | break; |
131 | |||
137 | default: | 132 | default: |
138 | wl_logerr("Unknown IEEE802.11 frame subtype (%d)", FC_SUBTYPE(fc)); | 133 | wl_logerr("Unknown IEEE802.11 frame subtype (%d)", FC_SUBTYPE(fc)); |
139 | break; | 134 | break; |
140 | } /* End of switch over different mgt frame types */ | 135 | } /* End of switch over different mgt frame types */ |
141 | 136 | ||
142 | break; | 137 | break; |
143 | 138 | ||
144 | case T_CTRL: | 139 | case T_CTRL: |
145 | wl_loginfo("Received control frame, not implemented yet"); | 140 | wl_loginfo("Received control frame, not implemented yet"); |
146 | break; | 141 | break; |
147 | 142 | ||
148 | case T_DATA: | 143 | case T_DATA: |
149 | wl_loginfo("Received date frame, not implemented yet"); | 144 | wl_loginfo("Received date frame, not implemented yet"); |
150 | break; | 145 | break; |
151 | 146 | ||
152 | default: | 147 | default: |
153 | wl_logerr("Unknown IEEE802.11 frame type (%d)", FC_TYPE(fc)); | 148 | wl_logerr("Unknown IEEE802.11 frame type (%d)", FC_TYPE(fc)); |
154 | break; | 149 | break; |
155 | } | 150 | } |
156 | } | 151 | } |
157 | 152 | ||
158 | /* This decodes the 802.11b frame header out of the 802.11b packet | 153 | /* This decodes the 802.11b frame header out of the 802.11b packet |
159 | all the infos is placed into the packetinfo structure */ | 154 | all the infos is placed into the packetinfo structure */ |
160 | int decode_80211b_hdr(const u_char *p,struct packetinfo *ppinfo) | 155 | int decode_80211b_hdr(const u_char *p,struct packetinfo *ppinfo) |