Update of /cvsroot/playerstage/code/player/client_libs/libplayerc
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13943/client_libs/libplayerc
Modified Files:
Tag: release-2-0-patches
dev_wifi.c playerc.h
Log Message:
applied patch 1766099
Index: dev_wifi.c
===================================================================
RCS file: /cvsroot/playerstage/code/player/client_libs/libplayerc/dev_wifi.c,v
retrieving revision 1.12.4.1
retrieving revision 1.12.4.2
diff -C2 -d -r1.12.4.1 -r1.12.4.2
*** dev_wifi.c 9 Jun 2006 01:17:51 -0000 1.12.4.1
--- dev_wifi.c 18 Oct 2007 22:21:12 -0000 1.12.4.2
***************
*** 40,44 ****
* Desc: WiFi device proxy
* Author: Andrew Howard
! * Date: 13 May 2002
* CVS: $Id$
**************************************************************************/
--- 40,44 ----
* Desc: WiFi device proxy
* Author: Andrew Howard
! * Date: 13 May 2002, updated July 2007
* CVS: $Id$
**************************************************************************/
***************
*** 95,99 ****
// Process incoming data
! void playerc_wifi_putmsg(playerc_wifi_t *self, player_msghdr_t *header,
player_wifi_data_t *data, size_t len)
{
--- 95,99 ----
// Process incoming data
! void playerc_wifi_putmsg(playerc_wifi_t *device, player_msghdr_t *header,
player_wifi_data_t *data, size_t len)
{
***************
*** 102,119 ****
if((header->type == PLAYER_MSGTYPE_DATA))
{
! self->link_count = data->links_count;
! for (i = 0; i < self->link_count; i++)
! {
! strncpy((char*)self->links[i].mac, (char*)data->links[i].mac,
sizeof(self->links[i].mac));
! strncpy((char*)self->links[i].ip, (char*)data->links[i].ip,
sizeof(self->links[i].ip));
! strncpy((char*)self->links[i].essid, (char*)data->links[i].essid,
sizeof(self->links[i].essid));
! self->links[i].mode = data->links[i].mode;
! self->links[i].encrypt = data->links[i].encrypt;
! self->links[i].freq = data->links[i].freq;
! self->links[i].qual = data->links[i].qual;
! self->links[i].level = data->links[i].level;
! self->links[i].noise = data->links[i].noise;
! }
}
return;
--- 102,121 ----
if((header->type == PLAYER_MSGTYPE_DATA))
{
! device->link_count = data->links_count;
!
! // copy all available link information
! for (i = 0; i < device->link_count; i++)
! {
! memcpy(device->links[i].mac, data->links[i].mac,
sizeof(data->links[i].mac));
! memcpy(device->links[i].ip, data->links[i].ip,
sizeof(device->links[i].ip));
! memcpy(device->links[i].essid, data->links[i].essid,
sizeof(device->links[i].essid));
! device->links[i].mode = data->links[i].mode;
! device->links[i].encrypt = data->links[i].encrypt;
! device->links[i].freq = data->links[i].freq;
! device->links[i].qual = data->links[i].qual;
! device->links[i].level = data->links[i].level;
! device->links[i].noise = data->links[i].noise;
! }
}
return;
Index: playerc.h
===================================================================
RCS file: /cvsroot/playerstage/code/player/client_libs/libplayerc/playerc.h,v
retrieving revision 1.185.2.7
retrieving revision 1.185.2.8
diff -C2 -d -r1.185.2.7 -r1.185.2.8
*** playerc.h 2 Oct 2007 21:04:31 -0000 1.185.2.7
--- playerc.h 18 Oct 2007 22:21:12 -0000 1.185.2.8
***************
*** 2510,2520 ****
{
/** Mac accress. */
! char mac[32];
/** IP address. */
! char ip[32];
/** ESSID id */
! char essid[32];
/** Mode (master, ad-hoc, etc). */
--- 2510,2520 ----
{
/** Mac accress. */
! uint8_t mac[32];
/** IP address. */
! uint8_t ip[32];
/** ESSID id */
! uint8_t essid[32];
/** Mode (master, ad-hoc, etc). */
***************
*** 2542,2546 ****
playerc_wifi_link_t links[PLAYERC_WIFI_MAX_LINKS];
int link_count;
!
} playerc_wifi_t;
--- 2542,2546 ----
playerc_wifi_link_t links[PLAYERC_WIFI_MAX_LINKS];
int link_count;
! char ip[32];
} playerc_wifi_t;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
