Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-25 14:50:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add wrapper function to convert uint16_t service IDs to internal unsigned int.

Browse source 
Use it when looking up service names.
This commit is contained in:
sehraf 2018-08-01 20:30:28 +02:00
parent 0d4eafde31
commit 97194fd092
No known key found for this signature in database
GPG key ID: DF09F6EAE356B2C6
4 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libretroshare/src/pqi/p3servicecontrol.cc
View file

@ -1369,13 +1369,18 @@ RsServiceInfo::RsServiceInfo(
const uint16_t min_version_major,
const uint16_t min_version_minor)
:mServiceName(service_name),
mServiceType((((uint32_t) RS_PKT_VERSION_SERVICE) << 24) + (((uint32_t) service_type) << 8)),
mServiceType(RsServiceInfoUIn16ToFullServiceId(service_type)),
mVersionMajor(version_major),
mVersionMinor(version_minor),
mMinVersionMajor(min_version_major),
mMinVersionMinor(min_version_minor)
{
return;
return;
}
unsigned int RsServiceInfo::RsServiceInfoUIn16ToFullServiceId(uint16_t serviceType)
{
return (((uint32_t) RS_PKT_VERSION_SERVICE) << 24) + (((uint32_t) serviceType) << 8);
}

2
libretroshare/src/retroshare/rsservicecontrol.h
View file

@ -53,6 +53,8 @@ class RsServiceInfo
// minimum version can communicate with.
uint16_t mMinVersionMajor;
uint16_t mMinVersionMinor;
static unsigned int RsServiceInfoUIn16ToFullServiceId(uint16_t serviceType);
};