summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc14
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh1
2 files changed, 11 insertions, 4 deletions
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
index 9e0a772..29dcc75 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
+++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
@@ -131,6 +131,7 @@ int card_set_promisc_up (const char *device)
131 if (err < 0) 131 if (err < 0)
132 { 132 {
133 perror("Could not access the interface, "); 133 perror("Could not access the interface, ");
134 close(fd);
134 return 0; 135 return 0;
135 } 136 }
136 137
@@ -140,17 +141,19 @@ int card_set_promisc_up (const char *device)
140 if (err < 0) 141 if (err < 0)
141 { 142 {
142 perror("Could not access the interface, "); 143 perror("Could not access the interface, ");
144 close(fd);
143 return 0; 145 return 0;
144 } 146 }
145 147
146 if(ifr.ifr_flags && IFF_UP) 148 if(ifr.ifr_flags && IFF_UP)
147 { 149 {
148 printf("%s is ok\n", device); 150 close(fd);
149 return 1; 151 return 1;
150 } 152 }
151 else 153 else
152 { 154 {
153 printf("%s flags could not be set", device); 155 wl_logerr("Could not set promisc flag on %d", device);
156 close(fd);
154 return 0; 157 return 0;
155 } 158 }
156} 159}
@@ -172,6 +175,7 @@ int card_set_channel (const char *device, int channel, int cardtype)
172 int *ptr; 175 int *ptr;
173 /* Socket needed to use the iocall to */ 176 /* Socket needed to use the iocall to */
174 fd = socket(AF_INET, SOCK_STREAM, 0); 177 fd = socket(AF_INET, SOCK_STREAM, 0);
178
175 if ( fd == -1 ) { 179 if ( fd == -1 ) {
176 return -1; 180 return -1;
177 } 181 }
@@ -183,12 +187,14 @@ int card_set_channel (const char *device, int channel, int cardtype)
183 if (ioctl( fd, SIOCIWFIRSTPRIV + 0x8, &ireq)==0) 187 if (ioctl( fd, SIOCIWFIRSTPRIV + 0x8, &ireq)==0)
184 { 188 {
185 /* All was fine... */ 189 /* All was fine... */
186 // close(fd); 190 close(fd);
187 wl_loginfo("Set channel %d on interface %s",channel, device); 191 wl_loginfo("Set channel %d on interface %s",channel, device);
188 return 1; 192 return 1;
189 } 193 }
190 else 194 else
191 { /* iocall does not work */ 195 {
196 /* iocall does not work */
197 close(fd);
192 wl_logerr("Could not set channel %d on %s, check cardtype",channel, device); 198 wl_logerr("Could not set channel %d on %s, check cardtype",channel, device);
193 return 0; 199 return 0;
194 } 200 }
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
index 242d8c5..4a95956 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
+++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
@@ -12,6 +12,7 @@
12#include <netinet/in.h> 12#include <netinet/in.h>
13#include <arpa/inet.h> 13#include <arpa/inet.h>
14#include <sys/ioctl.h> 14#include <sys/ioctl.h>
15#include <unistd.h>
15#include <linux/if.h> 16#include <linux/if.h>
16#include <linux/wireless.h> 17#include <linux/wireless.h>
17 18