Update of /cvsroot/playerstage/code/player/server/drivers/wifi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8383/server/drivers/wifi
Modified Files:
iwspy.cc linuxwifi.cc
Log Message:
applied
[ 1895536 ] CVS: linuxwifi can't be compiled with recent 2.6 kernheaders
Index: linuxwifi.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/wifi/linuxwifi.cc,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** linuxwifi.cc 1 Nov 2007 22:16:23 -0000 1.19
--- linuxwifi.cc 18 Feb 2008 19:32:04 -0000 1.20
***************
*** 76,79 ****
--- 76,81 ----
/** @} */
+ #include <stddef.h>
+ #include <assert.h>
#include <ctype.h>
#include <pthread.h>
***************
*** 83,86 ****
--- 85,89 ----
#include <net/ethernet.h>
#include <netinet/in.h>
+ #include <linux/if.h>
#include <linux/wireless.h>
#include <sys/ioctl.h>
***************
*** 441,445 ****
wifi_data.qual_type = qual_type;
! Publish(device_addr,
PLAYER_MSGTYPE_DATA,PLAYER_WIFI_DATA_STATE,(void*)&wifi_data,
sizeof(player_wifi_data_t),NULL);
}
--- 444,448 ----
wifi_data.qual_type = qual_type;
! Publish(device_addr,
PLAYER_MSGTYPE_DATA,PLAYER_WIFI_DATA_STATE,(void*)&wifi_data);
}
Index: iwspy.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/wifi/iwspy.cc,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** iwspy.cc 23 Aug 2007 19:58:48 -0000 1.21
--- iwspy.cc 18 Feb 2008 19:32:04 -0000 1.22
***************
*** 84,87 ****
--- 84,89 ----
#include <string.h>
#include <stdlib.h>
+ #include <stddef.h>
+ #include <assert.h>
#include <sys/stat.h>
***************
*** 290,294 ****
if (nic->in_count > nic->out_count)
{
! link = data.links + data.links_count++;
memcpy(link->ip, nic->ip, strlen(nic->ip));
link->ip_count = strlen(nic->ip);
--- 292,300 ----
if (nic->in_count > nic->out_count)
{
! data.links_count++;
! data.links = reinterpret_cast<player_wifi_link_t
*>(realloc(data.links, sizeof(player_wifi_link_t) * data.links_count));
! assert(data.links);
! link = data.links + (data.links_count - 1);
! assert(link);
memcpy(link->ip, nic->ip, strlen(nic->ip));
link->ip_count = strlen(nic->ip);
***************
*** 301,309 ****
}
}
- data.links_count = data.links_count;
// Send data
this->Publish(this->device_addr,PLAYER_MSGTYPE_DATA,
! PLAYER_WIFI_DATA_STATE, &data, sizeof(data), &time);
}
return;
--- 307,317 ----
}
}
// Send data
this->Publish(this->device_addr,PLAYER_MSGTYPE_DATA,
! PLAYER_WIFI_DATA_STATE, &data, 0, &time);
! if (data.links) free(data.links);
! data.links = NULL;
! data.links_count = 0;
}
return;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
