mirror/ULib
1
0
Fork 0
mirror of https://github.com/stefanocasazza/ULib.git synced 2025-10-26 19:57:22 +08:00
Code Issues Releases Wiki Activity

some fix + xxhash

Browse Source
This commit is contained in:
stefanocasazza
2016-06-08 16:10:01 +02:00
parent 266490fa5d
commit bcdc99a8ac
73 changed files with 2819 additions and 1045 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/ulib/net/client/mongodb.h
View File

@@ -122,8 +122,7 @@ public:
bool findOne(const char* json, uint32_t len);
bool find(bson_t* query, bson_t* projection);
bool find(bson_t* query, bson_t* projection = 0, mongoc_query_flags_t flags = MONGOC_QUERY_NONE, mongoc_read_prefs_t* read_prefs = 0);
bool findAggregation(bson_t* pipeline, bson_t* options = 0, mongoc_query_flags_t flags = MONGOC_QUERY_NONE, mongoc_read_prefs_t* read_prefs = 0); // Execute an 'aggregation' query
bool update(bson_t* query, bson_t* update);
@@ -149,6 +148,8 @@ protected:
mongoc_collection_t* collection;
#endif
void readFromCursor();
private:
#ifdef U_COMPILER_DELETE_MEMBERS
UMongoDBClient(const UMongoDBClient&) = delete;

14
include/ulib/net/server/plugin/mod_nocat.h
View File

@@ -193,6 +193,7 @@ protected:
static UVector<UString>* varp_cache;
static UVector<UString>* vinfo_data;
static UVector<UIPAddress*>** vaddr;
static UVector<UString>* vroaming_data;
static UHttpClient<UTCPSocket>* client;
static UHashMap<UModNoCatPeer*>* peers;
static UVector<UString>* vLoginValidate;
@@ -224,8 +225,9 @@ protected:
static void checkSystem();
static void checkOldPeer();
static void creatNewPeer();
static void setPeerLabel();
static bool setPeerLabel();
static bool checkFirewall();
static void addPeerRoaming();
static bool preallocatePeersFault();
static bool getPeer(uint32_t i) __pure;
static void addPeerInfo(int disconnected);
@@ -233,6 +235,7 @@ protected:
static bool creatNewPeer(uint32_t index_AUTH);
static void sendInfoData(uint32_t index_AUTH);
static bool getPeerFromMAC(const UString& mac);
static void sendRoamingData(uint32_t index_AUTH);
static bool checkAuthMessage(const UString& msg);
static void setStatusContent(const UString& label);
static void deny(int disconnected, bool bcheck_expire);
@@ -244,6 +247,7 @@ protected:
static void setHTTPResponse(const UString& content, int mime_index);
static void permit(const UString& UserDownloadRate, const UString& UserUploadRate);
static void sendMsgToPortal(uint32_t index_AUTH, const UString& msg, UString* poutput);
static void sendData(uint32_t index_AUTH, const UString& data, const char* service, uint32_t service_len);
static uint32_t checkFirewall(UString& output);
static uint32_t getIndexAUTH(const char* ip_address) __pure;
@@ -304,16 +308,16 @@ protected:
U_peer_status = type;
}
static UString getUrlForSendMsgToPortal(uint32_t index_AUTH, const char* msg, uint32_t msg_len)
static UString getUrlForSendMsgToPortal(uint32_t index_AUTH, const char* service, uint32_t service_len)
{
U_TRACE(0, "UNoCatPlugIn::getUrlForSendMsgToPortal(%u,%.*S,%u)", index_AUTH, msg_len, msg, msg_len)
U_TRACE(0, "UNoCatPlugIn::getUrlForSendMsgToPortal(%u,%.*S,%u)", index_AUTH, service_len, service, service_len)
Url* auth = (*vauth_url)[index_AUTH];
UString auth_host = auth->getHost(),
auth_service = auth->getService(),
url(200U + auth_host.size() + auth_service.size() + msg_len);
url(200U + auth_host.size() + auth_service.size() + service_len);
url.snprintf("%v://%v%.*s", auth_service.rep, auth_host.rep, msg_len, msg);
url.snprintf("%v://%v%.*s", auth_service.rep, auth_host.rep, service_len, service);
U_RETURN_STRING(url);
}