Skip to content

Commit 598151d

Browse files
xengine-qytxengine-qyt
committed
fixed:api name case-insensitive
1 parent 9243815 commit 598151d

6 files changed

Lines changed: 33 additions & 33 deletions

File tree

‎XEngine_Source/XEngine_StorageApp/StorageApp_Center.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ bool XEngine_Task_HttpCenter(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
5959
int nUrlCount = 0;
6060
//得到URL参数个数
6161
HttpProtocol_ServerHelp_GetParament(pSt_HTTPParam->tszHttpUri, &pptszUrlList, &nUrlCount, tszUrlName);
62-
if (nUrlCount < 1 && (0 != _tcsxncmp(lpszMethodHead, pSt_HTTPParam->tszHttpMethod, _tcsxlen(lpszMethodHead))))
62+
if (nUrlCount < 1 && (0 != _tcsxnicmp(lpszMethodHead, pSt_HTTPParam->tszHttpMethod, _tcsxlen(lpszMethodHead))))
6363
{
6464
st_HDRParam.nHttpCode = 400;
6565
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
@@ -163,52 +163,52 @@ bool XEngine_Task_HttpCenter(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
163163
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,HTTP验证类型:%d 通过"), lpszClientAddr, nVType);
164164
}
165165

166-
if (0 == _tcsxncmp(lpszMethodPost, pSt_HTTPParam->tszHttpMethod, _tcsxlen(lpszMethodPost)))
166+
if (0 == _tcsxnicmp(lpszMethodPost, pSt_HTTPParam->tszHttpMethod, _tcsxlen(lpszMethodPost)))
167167
{
168168
LPCXSTR lpszAPIPass = _X("Pass");
169169
LPCXSTR lpszAPIManage = _X("Manage");
170170
LPCXSTR lpszAPIAction = _X("Action");
171171

172172
BaseLib_String_GetKeyValueA(pptszUrlList[0], "=", tszStrKey, tszStrVlu);
173173
//通知类型.用于多服务器
174-
if (0 == _tcsxncmp(lpszAPIPass, tszStrVlu, _tcsxlen(lpszAPIPass)))
174+
if (0 == _tcsxnicmp(lpszAPIPass, tszStrVlu, _tcsxlen(lpszAPIPass)))
175175
{
176176
//http://127.0.0.1:5100/api?function=pass&param=xxx
177177
memset(tszStrVlu, '\0', sizeof(tszStrVlu));
178178
BaseLib_String_GetKeyValueA(pptszUrlList[1], "=", tszStrKey, tszStrVlu);
179179
XEngine_Task_Pass(tszStrVlu, lpszClientAddr, lpszMsgBuffer, nMsgLen, pSt_HTTPParam);
180180
}
181-
else if (0 == _tcsxncmp(lpszAPIManage, tszStrVlu, _tcsxlen(lpszAPIManage)))
181+
else if (0 == _tcsxnicmp(lpszAPIManage, tszStrVlu, _tcsxlen(lpszAPIManage)))
182182
{
183183
//http://127.0.0.1:5100/api?function=manage&param=xxx
184184
memset(tszStrVlu, '\0', sizeof(tszStrVlu));
185185
BaseLib_String_GetKeyValueA(pptszUrlList[1], "=", tszStrKey, tszStrVlu);
186186
XEngine_Task_Manage(tszStrVlu, lpszClientAddr, lpszMsgBuffer, nMsgLen, pSt_HTTPParam);
187187
}
188-
else if (0 == _tcsxncmp(lpszAPIAction, tszStrVlu, _tcsxlen(lpszAPIAction)))
188+
else if (0 == _tcsxnicmp(lpszAPIAction, tszStrVlu, _tcsxlen(lpszAPIAction)))
189189
{
190190
//http://127.0.0.1:5100/api?function=action&param=xxx
191191
memset(tszStrVlu, '\0', sizeof(tszStrVlu));
192192
BaseLib_String_GetKeyValueA(pptszUrlList[1], "=", tszStrKey, tszStrVlu);
193193
Storage_TaskAction(tszStrVlu, lpszClientAddr, lpszMsgBuffer, nMsgLen, pSt_HTTPParam);
194194
}
195195
}
196-
else if (0 == _tcsxncmp(lpszMethodGet, pSt_HTTPParam->tszHttpMethod, _tcsxlen(lpszMethodGet)))
196+
else if (0 == _tcsxnicmp(lpszMethodGet, pSt_HTTPParam->tszHttpMethod, _tcsxlen(lpszMethodGet)))
197197
{
198198
//用于心跳
199199
//http://127.0.0.1:5100/api?function=heart
200200
LPCXSTR lpszAPIHeart = _X("heart");
201201

202202
BaseLib_String_GetKeyValueA(pptszUrlList[0], "=", tszStrKey, tszStrVlu);
203-
if (0 == _tcsxncmp(lpszAPIHeart, tszStrVlu, _tcsxlen(lpszAPIHeart)))
203+
if (0 == _tcsxnicmp(lpszAPIHeart, tszStrVlu, _tcsxlen(lpszAPIHeart)))
204204
{
205205
LPCXSTR lpszHdrBuffer = _X("Allow: POST GET PUT\r\n");
206206
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, NULL, 0, lpszHdrBuffer);
207207
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
208208
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("业务客户端:%s,请求GET心跳方法成功"), lpszClientAddr);
209209
}
210210
}
211-
else if (0 == _tcsxncmp(lpszMethodHead, pSt_HTTPParam->tszHttpMethod, _tcsxlen(lpszMethodHead)))
211+
else if (0 == _tcsxnicmp(lpszMethodHead, pSt_HTTPParam->tszHttpMethod, _tcsxlen(lpszMethodHead)))
212212
{
213213
//获得文件大小
214214
XCHAR tszFileExt[64] = {};

‎XEngine_Source/XEngine_StorageApp/StorageApp_Config.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,49 +48,49 @@ bool StorageApp_Config_Parament(int argc,char **argv)
4848

4949
for (int i = 0;i < argc;i++)
5050
{
51-
if (0 == _tcsxcmp("-h",argv[i]))
51+
if (0 == _tcsxicmp("-h",argv[i]))
5252
{
5353
StorageApp_Config_ParamentHelp();
5454
return false;
5555
}
56-
if (0 == _tcsxcmp("-v", argv[i]))
56+
if (0 == _tcsxicmp("-v", argv[i]))
5757
{
5858
string m_StrVersion = st_ServiceCfg.st_XVer.pStl_ListStorage->front();
5959
printf("Version：%s\n", m_StrVersion.c_str());
6060
return false;
6161
}
62-
else if (0 == _tcsxcmp("-d", argv[i]))
62+
else if (0 == _tcsxicmp("-d", argv[i]))
6363
{
6464
st_ServiceCfg.bDeamon = _ttxoi(argv[++i]);
6565
}
66-
else if (0 == _tcsxcmp("-r", argv[i]))
66+
else if (0 == _tcsxicmp("-r", argv[i]))
6767
{
6868
st_ServiceCfg.st_Memory.bReload = true;
6969
}
70-
else if (0 == _tcsxcmp("-u", argv[i]))
70+
else if (0 == _tcsxicmp("-u", argv[i]))
7171
{
7272
st_ServiceCfg.bReuseraddr = true;
7373
}
74-
else if (0 == _tcsxcmp("-t", argv[i]))
74+
else if (0 == _tcsxicmp("-t", argv[i]))
7575
{
7676
bIsTest = true;
7777
}
78-
else if (0 == _tcsxcmp("-lt", argv[i]))
78+
else if (0 == _tcsxicmp("-lt", argv[i]))
7979
{
8080
st_ServiceCfg.st_XLog.nLogType = _ttxoi(argv[++i]);
8181
}
82-
else if (0 == _tcsxcmp("-l", argv[i]))
82+
else if (0 == _tcsxicmp("-l", argv[i]))
8383
{
8484
LPCXSTR lpszLogLevel = argv[++i];
85-
if (0 == _tcsxcmp("debug", lpszLogLevel))
85+
if (0 == _tcsxicmp("debug", lpszLogLevel))
8686
{
8787
st_ServiceCfg.st_XLog.nLogLeave = XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG;
8888
}
89-
else if (0 == _tcsxcmp("detail", lpszLogLevel))
89+
else if (0 == _tcsxicmp("detail", lpszLogLevel))
9090
{
9191
st_ServiceCfg.st_XLog.nLogLeave = XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DETAIL;
9292
}
93-
else if (0 == _tcsxcmp("info", lpszLogLevel))
93+
else if (0 == _tcsxicmp("info", lpszLogLevel))
9494
{
9595
st_ServiceCfg.st_XLog.nLogLeave = XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO;
9696
}

‎XEngine_Source/XEngine_StorageApp/StorageApp_Download.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ bool XEngine_Task_HttpDownload(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, in
152152
memset(&st_HDRParam, '\0', sizeof(RFCCOMPONENTS_HTTP_HDRPARAM));
153153

154154
LPCXSTR lpszMethodGet = _X("GET");
155-
if (0 != _tcsxncmp(lpszMethodGet, pSt_HTTPParam->tszHttpMethod, _tcsxlen(lpszMethodGet)))
155+
if (0 != _tcsxnicmp(lpszMethodGet, pSt_HTTPParam->tszHttpMethod, _tcsxlen(lpszMethodGet)))
156156
{
157157
st_HDRParam.bIsClose = true;
158158
st_HDRParam.nHttpCode = 405;

‎XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ bool XEngine_Task_HttpUPLoader(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, in
6666
LPCXSTR lpszMethodPost = _X("POST");
6767
LPCXSTR lpszMethodPut = _X("PUT");
6868

69-
if ((0 != _tcsxncmp(lpszMethodPost, pSt_HTTPParam->tszHttpMethod, _tcsxlen(lpszMethodPost))) && (0 != _tcsxncmp(lpszMethodPut, pSt_HTTPParam->tszHttpMethod, _tcsxlen(lpszMethodPut))))
69+
if ((0 != _tcsxnicmp(lpszMethodPost, pSt_HTTPParam->tszHttpMethod, _tcsxlen(lpszMethodPost))) && (0 != _tcsxnicmp(lpszMethodPut, pSt_HTTPParam->tszHttpMethod, _tcsxlen(lpszMethodPut))))
7070
{
7171
st_HDRParam.bIsClose = true;
7272
st_HDRParam.nHttpCode = 405;

‎XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskManage.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
1818

1919
st_HDRParam.bIsClose = true;
2020
st_HDRParam.nHttpCode = 200;
21-
if (0 == _tcsxncmp(lpszAPIConfig, lpszAPIName, _tcsxlen(lpszAPIConfig)))
21+
if (0 == _tcsxnicmp(lpszAPIConfig, lpszAPIName, _tcsxlen(lpszAPIConfig)))
2222
{
2323
StorageApp_Config_Parament(0, NULL);
2424
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
2525
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
2626
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("业务客户端:%s,处理用户重载配置文件成功"), lpszClientAddr);
2727
}
28-
else if (0 == _tcsxncmp(lpszAPIQuery, lpszAPIName, _tcsxlen(lpszAPIQuery)))
28+
else if (0 == _tcsxnicmp(lpszAPIQuery, lpszAPIName, _tcsxlen(lpszAPIQuery)))
2929
{
3030
//查询文件列表
3131
int nMode = 0;
@@ -160,7 +160,7 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
160160
stl_ListFile.clear();
161161
}
162162
}
163-
else if (0 == _tcsxncmp(lpszAPIInsert, lpszAPIName, _tcsxlen(lpszAPIInsert)))
163+
else if (0 == _tcsxnicmp(lpszAPIInsert, lpszAPIName, _tcsxlen(lpszAPIInsert)))
164164
{
165165
int nListCount = 0;
166166
XSTORAGECORE_DBFILE** ppSt_DBFile;
@@ -200,7 +200,7 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
200200
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
201201
BaseLib_Memory_Free((XPPPMEM)&ppSt_DBFile, nListCount);
202202
}
203-
else if (0 == _tcsxncmp(lpszAPIDelete, lpszAPIName, _tcsxlen(lpszAPIDelete)))
203+
else if (0 == _tcsxnicmp(lpszAPIDelete, lpszAPIName, _tcsxlen(lpszAPIDelete)))
204204
{
205205
int nListCount = 0;
206206
XSTORAGECORE_DBFILE** ppSt_DBFile;
@@ -278,7 +278,7 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
278278
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
279279
BaseLib_Memory_Free((XPPPMEM)&ppSt_DBFile, nListCount);
280280
}
281-
else if (0 == _tcsxncmp(lpszAPIDir, lpszAPIName, _tcsxlen(lpszAPIDir)))
281+
else if (0 == _tcsxnicmp(lpszAPIDir, lpszAPIName, _tcsxlen(lpszAPIDir)))
282282
{
283283
int nOPCode = 0;
284284
int nListCount = 0;
@@ -344,7 +344,7 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
344344
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("业务客户端:%s,请求删除文件夹:%s,成功"), lpszClientAddr, tszRealDir);
345345
}
346346
}
347-
else if (0 == _tcsxncmp(lpszAPIBucket, lpszAPIName, _tcsxlen(lpszAPIBucket)))
347+
else if (0 == _tcsxnicmp(lpszAPIBucket, lpszAPIName, _tcsxlen(lpszAPIBucket)))
348348
{
349349
XCHAR tszBuckKey[XPATH_MAX] = {};
350350
Protocol_StorageParse_DirOperator(lpszMsgBuffer, NULL, tszBuckKey, NULL);
@@ -371,7 +371,7 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
371371
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
372372
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("业务客户端:%s,请求获取BUCKET信息成功"), lpszClientAddr);
373373
}
374-
else if (0 == _tcsxncmp(lpszAPIFlushSize, lpszAPIName, _tcsxlen(lpszAPIFlushSize)))
374+
else if (0 == _tcsxnicmp(lpszAPIFlushSize, lpszAPIName, _tcsxlen(lpszAPIFlushSize)))
375375
{
376376
XCHAR tszBuckKey[XPATH_MAX] = {};
377377
Protocol_StorageParse_DirOperator(lpszMsgBuffer, NULL, tszBuckKey, NULL);
@@ -380,7 +380,7 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
380380
XENGINE_STORAGEBUCKET st_StorageBucket = {};
381381
for (auto stl_ListIterator = st_LoadbalanceCfg.st_LoadBalance.pStl_ListBucket->begin(); stl_ListIterator != st_LoadbalanceCfg.st_LoadBalance.pStl_ListBucket->end(); stl_ListIterator++)
382382
{
383-
if (0 == _tcsxncmp(stl_ListIterator->tszBuckKey, tszBuckKey, _tcsxlen(stl_ListIterator->tszBuckKey)))
383+
if (0 == _tcsxnicmp(stl_ListIterator->tszBuckKey, tszBuckKey, _tcsxlen(stl_ListIterator->tszBuckKey)))
384384
{
385385
APIHelp_Api_GetDIRSize(stl_ListIterator->tszFilePath, &stl_ListIterator->nBuckSize);
386386
st_StorageBucket = *stl_ListIterator;
@@ -394,7 +394,7 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
394394
{
395395
for (auto stl_ListIterator = st_LoadbalanceCfg.st_LoadBalance.pStl_ListBucket->begin(); stl_ListIterator != st_LoadbalanceCfg.st_LoadBalance.pStl_ListBucket->end(); stl_ListIterator++)
396396
{
397-
if (0 == _tcsxncmp(stl_ListIterator->tszBuckKey, tszBuckKey, _tcsxlen(stl_ListIterator->tszBuckKey)))
397+
if (0 == _tcsxnicmp(stl_ListIterator->tszBuckKey, tszBuckKey, _tcsxlen(stl_ListIterator->tszBuckKey)))
398398
{
399399
APIHelp_Api_GetDIRSize(stl_ListIterator->tszFilePath, &stl_ListIterator->nBuckSize);
400400
}
@@ -405,7 +405,7 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
405405
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
406406
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("业务客户端:%s,请求刷新BUCKET大小成功"), lpszClientAddr);
407407
}
408-
else if (0 == _tcsxncmp(lpszAPITask, lpszAPIName, _tcsxlen(lpszAPITask)))
408+
else if (0 == _tcsxnicmp(lpszAPITask, lpszAPIName, _tcsxlen(lpszAPITask)))
409409
{
410410
int nDLCount = 0;
411411
int nUPCount = 0;

‎XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskPass.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ bool XEngine_Task_Pass(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lpsz
1414
st_HDRParam.bIsClose = true;
1515
st_HDRParam.nHttpCode = 200;
1616
//下载
17-
if (0 == _tcsxncmp(lpszAPIUPFile, lpszAPIName, _tcsxlen(lpszAPIUPFile)))
17+
if (0 == _tcsxnicmp(lpszAPIUPFile, lpszAPIName, _tcsxlen(lpszAPIUPFile)))
1818
{
1919
XCHAR tszClientAddr[128];
2020
XSTORAGECORE_DBFILE st_DBFile;
@@ -26,7 +26,7 @@ bool XEngine_Task_Pass(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lpsz
2626
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
2727
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("业务客户端:%s,请求的上传文件通知协议成功,Bucket:%s,文件名:%s,大小:%d"), lpszClientAddr, st_DBFile.tszBuckKey, st_DBFile.st_ProtocolFile.tszFileName, st_DBFile.st_ProtocolFile.nFileSize);
2828
}
29-
else if (0 == _tcsxncmp(lpszAPIDLFile, lpszAPIName, _tcsxlen(lpszAPIDLFile)))
29+
else if (0 == _tcsxnicmp(lpszAPIDLFile, lpszAPIName, _tcsxlen(lpszAPIDLFile)))
3030
{
3131
__int64x nFileSize = 0;
3232
XCHAR tszPathKey[XPATH_MAX];

0 commit comments

Comments
 (0)