DevKit7/libctru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated udsConnectionStatus and networkstruct. Removed total_nodes from udsNetworkScanInfo since that's stored in the networkstruct.

Browse Source
This commit is contained in:
yellows8 2016-04-07 13:06:23 -04:00
parent 72b6b3e48b
commit 570c834679
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libctru/include/3ds/services/uds.h
View File

@ -30,10 +30,15 @@ typedef struct {
/// Connection status struct. /// Connection status struct.
typedef struct { typedef struct {
u32 status; u32 status;
u32 unk_x4[0x28>>2]; u32 unk_x4;
u8 val_x2c; u16 cur_NetworkNodeID;//"u16 NetworkNodeID for this device."
u16 unk_xa;
u32 unk_xc[0x20>>2];
u8 total_nodes;
u8 max_nodes; u8 max_nodes;
u8 unk_x2e[2]; u8 node_bitmask;//"This is a bitmask of NetworkNodeIDs: bit0 for NetworkNodeID 0x1(host), bit1 for NetworkNodeID 0x2(first original client), and so on."
u8 unk_x2f;//"Padding maybe? Normally 0. "
} udsConnectionStatus; } udsConnectionStatus;
/// Network struct stored as big-endian. /// Network struct stored as big-endian.
@ -54,8 +59,10 @@ typedef struct {
u8 unk_x15; u8 unk_x15;
u16 attributes;//See the UDSNETATTR enum values below. u16 attributes;//See the UDSNETATTR enum values below.
u8 unk_x18[5];
u32 networkID;
u8 total_nodes;
u8 max_nodes; u8 max_nodes;
u8 unk_x1e; u8 unk_x1e;
u8 unk_x1f; u8 unk_x1f;
@ -111,7 +118,6 @@ typedef struct {
typedef struct { typedef struct {
nwmBeaconDataReplyEntry datareply_entry; nwmBeaconDataReplyEntry datareply_entry;
udsNetworkStruct network; udsNetworkStruct network;
u32 total_nodes;//Total number of nodes actually connected to the network, including the host.
udsNodeInfo nodes[UDS_MAXNODES]; udsNodeInfo nodes[UDS_MAXNODES];
} udsNetworkScanInfo; } udsNetworkScanInfo;

8
libctru/source/services/uds.c
View File

@ -612,7 +612,6 @@ static Result usd_parsebeacon(u8 *buf, u32 size, udsNetworkScanInfo *networkscan
u8 *tags_data[3] = {0}; u8 *tags_data[3] = {0};
u32 tags_sizes[3] = {0}; u32 tags_sizes[3] = {0};
int tagindex; int tagindex;
u32 pos;
u8 tmp_tagdata[0xfe*2]; u8 tmp_tagdata[0xfe*2];
@ -708,13 +707,6 @@ static Result usd_parsebeacon(u8 *buf, u32 size, udsNetworkScanInfo *networkscan
ret = udsipc_DecryptBeaconData(&networkscan->network, tmp_tagdata, &tmp_tagdata[0xfe], networkscan->nodes); ret = udsipc_DecryptBeaconData(&networkscan->network, tmp_tagdata, &tmp_tagdata[0xfe], networkscan->nodes);
if(R_FAILED(ret))return ret; if(R_FAILED(ret))return ret;
for(pos=0; pos<UDS_MAXNODES; pos++)
{
if(!udsCheckNodeInfoInitialized(&networkscan->nodes[pos]))break;
networkscan->total_nodes++;
}
return 0; return 0;
} }