diff --git a/c/meterpreter/source/extensions/stdapi/server/fs/search.c b/c/meterpreter/source/extensions/stdapi/server/fs/search.c
index 5cdf5346..917421c7 100644
--- a/c/meterpreter/source/extensions/stdapi/server/fs/search.c
+++ b/c/meterpreter/source/extensions/stdapi/server/fs/search.c
@@ -615,8 +615,8 @@ DWORD wds3_search(WDS_INTERFACE * pWDSInterface, wchar_t * wpProtocol, wchar_t *
BREAK_WITH_ERROR("[SEARCH] wds3_search: unable to create where query buffer", GetLastError());
}
- if (pOptions->startDate > 0) {
- DWORD sd = pOptions->startDate;
+ if (pOptions->m_startDate > 0) {
+ DWORD sd = pOptions->m_startDate;
FILETIME ft = { 0 };
DWORD HR = ERROR_SUCCESS;
HR = uintToFILETIME(sd,&ft);
@@ -631,8 +631,8 @@ DWORD wds3_search(WDS_INTERFACE * pWDSInterface, wchar_t * wpProtocol, wchar_t *
sd_mask += 2;
}
- if (pOptions->endDate > 0) {
- DWORD ed = pOptions->endDate;
+ if (pOptions->m_endDate > 0) {
+ DWORD ed = pOptions->m_endDate;
wchar_t tmp[25] = { 0 };
wchar_t* to = calloc(80, sizeof(wchar_t));
FILETIME ft = { 0 };
@@ -820,8 +820,8 @@ DWORD directory_search(wchar_t *directory, SEARCH_OPTIONS * pOptions, Packet * p
size_t len = wcslen(directory) + 5;
DWORD mask = 0;
- DWORD sd = pOptions->startDate;
- DWORD ed = pOptions->endDate;
+ DWORD sd = pOptions->m_startDate;
+ DWORD ed = pOptions->m_endDate;
FILETIME sdts = { 0 };
FILETIME edts = { 0 };
if (sd > 0) {
@@ -981,8 +981,8 @@ DWORD request_fs_search(Remote * pRemote, Packet * pPacket)
options.glob = met_api->string.utf8_to_wchar(
met_api->packet.get_tlv_value_string(pPacket, TLV_TYPE_SEARCH_GLOB));
- options.startDate = met_api->packet.get_tlv_value_uint(pPacket,TLV_TYPE_SEARCH_FROM_DATE);
- options.endDate = met_api->packet.get_tlv_value_uint(pPacket, TLV_TYPE_SEARCH_TO_DATE);
+ options.m_startDate = met_api->packet.get_tlv_value_uint(pPacket,TLV_TYPE_SEARCH_M_START_DATE);
+ options.m_endDate = met_api->packet.get_tlv_value_uint(pPacket, TLV_TYPE_SEARCH_M_END_DATE);
if (options.rootDirectory && wcslen(options.rootDirectory) == 0) {
@@ -1002,7 +1002,7 @@ DWORD request_fs_search(Remote * pRemote, Packet * pPacket)
}
dprintf("[SEARCH] root: '%S' glob: '%S'", options.rootDirectory, options.glob);
- dprintf("[SEARCH] dates: from %u to %u", options.startDate, options.endDate);
+ dprintf("[SEARCH] dates: from %u to %u", options.m_startDate, options.m_endDate);
options.bResursive = met_api->packet.get_tlv_value_bool(pPacket, TLV_TYPE_SEARCH_RECURSE);
diff --git a/c/meterpreter/source/extensions/stdapi/server/fs/search.h b/c/meterpreter/source/extensions/stdapi/server/fs/search.h
index a086be6c..a931588a 100644
--- a/c/meterpreter/source/extensions/stdapi/server/fs/search.h
+++ b/c/meterpreter/source/extensions/stdapi/server/fs/search.h
@@ -39,8 +39,8 @@ typedef struct _SEARCH_OPTIONS
wchar_t *glob;
wchar_t *rootDirectory;
BOOL bResursive;
- UINT startDate;
- UINT endDate;
+ UINT m_startDate;
+ UINT m_endDate;
} SEARCH_OPTIONS;
// sf: The padding DWORD's ensure we dont get an IAccessor_CreateAccessor error due to alignment on x64.
diff --git a/c/meterpreter/source/extensions/stdapi/stdapi.h b/c/meterpreter/source/extensions/stdapi/stdapi.h
index 58da1e81..f9ed1d55 100755
--- a/c/meterpreter/source/extensions/stdapi/stdapi.h
+++ b/c/meterpreter/source/extensions/stdapi/stdapi.h
@@ -41,9 +41,9 @@
#define TLV_TYPE_SEARCH_GLOB MAKE_CUSTOM_TLV( TLV_META_TYPE_STRING, TLV_TYPE_EXTENSION_STDAPI, 1231 )
#define TLV_TYPE_SEARCH_ROOT MAKE_CUSTOM_TLV( TLV_META_TYPE_STRING, TLV_TYPE_EXTENSION_STDAPI, 1232 )
#define TLV_TYPE_SEARCH_RESULTS MAKE_CUSTOM_TLV( TLV_META_TYPE_GROUP, TLV_TYPE_EXTENSION_STDAPI, 1233 )
-#define TLV_TYPE_SEARCH_MTIME MAKE_CUSTOM_TLV( TLV_META_TYPE_UINT, TLV_TYPE_EXTENSION_STDAPI, 1235 )
-#define TLV_TYPE_SEARCH_FROM_DATE MAKE_CUSTOM_TLV( TLV_META_TYPE_UINT, TLV_TYPE_EXTENSION_STDAPI, 1236 )
-#define TLV_TYPE_SEARCH_TO_DATE MAKE_CUSTOM_TLV( TLV_META_TYPE_UINT, TLV_TYPE_EXTENSION_STDAPI, 1237 )
+#define TLV_TYPE_SEARCH_MTIME MAKE_CUSTOM_TLV( TLV_META_TYPE_UINT, TLV_TYPE_EXTENSION_STDAPI, 1235 )
+#define TLV_TYPE_SEARCH_M_START_DATE MAKE_CUSTOM_TLV( TLV_META_TYPE_UINT, TLV_TYPE_EXTENSION_STDAPI, 1236 )
+#define TLV_TYPE_SEARCH_M_END_DATE MAKE_CUSTOM_TLV( TLV_META_TYPE_UINT, TLV_TYPE_EXTENSION_STDAPI, 1237 )
// Process
diff --git a/java/meterpreter/stdapi/src/main/java/com/metasploit/meterpreter/stdapi/stdapi_fs_search.java b/java/meterpreter/stdapi/src/main/java/com/metasploit/meterpreter/stdapi/stdapi_fs_search.java
index 370ea410..4322b362 100644
--- a/java/meterpreter/stdapi/src/main/java/com/metasploit/meterpreter/stdapi/stdapi_fs_search.java
+++ b/java/meterpreter/stdapi/src/main/java/com/metasploit/meterpreter/stdapi/stdapi_fs_search.java
@@ -21,8 +21,8 @@ public class stdapi_fs_search implements Command {
private static final int TLV_TYPE_SEARCH_RESULTS = TLVPacket.TLV_META_TYPE_GROUP | 1233;
private static final int TLV_TYPE_SEARCH_MTIME = TLVPacket.TLV_META_TYPE_UINT | 1235;
- private static final int TLV_TYPE_SEARCH_FROM_DATE = TLVPacket.TLV_META_TYPE_UINT | 1236;
- private static final int TLV_TYPE_SEARCH_TO_DATE = TLVPacket.TLV_META_TYPE_UINT | 1237;
+ private static final int TLV_TYPE_SEARCH_M_START_DATE = TLVPacket.TLV_META_TYPE_UINT | 1236;
+ private static final int TLV_TYPE_SEARCH_M_END_DATE = TLVPacket.TLV_META_TYPE_UINT | 1237;
/**
@@ -106,8 +106,8 @@ public class stdapi_fs_search implements Command {
String root = request.getStringValue(TLV_TYPE_SEARCH_ROOT, ".");
String glob = request.getStringValue(TLV_TYPE_SEARCH_GLOB);
boolean recurse = request.getBooleanValue(TLV_TYPE_SEARCH_RECURSE);
- long sd = (long) request.getIntValue(TLV_TYPE_SEARCH_FROM_DATE);
- long ed = (long) request.getIntValue(TLV_TYPE_SEARCH_TO_DATE);
+ long sd = (long) request.getIntValue(TLV_TYPE_SEARCH_M_START_DATE);
+ long ed = (long) request.getIntValue(TLV_TYPE_SEARCH_M_END_DATE);
List files = findFiles(root, glob, recurse, sd, ed);
for (int i = 0; i < files.size(); i++) {
diff --git a/php/meterpreter/ext_server_stdapi.php b/php/meterpreter/ext_server_stdapi.php
index 934fb382..3d048d80 100755
--- a/php/meterpreter/ext_server_stdapi.php
+++ b/php/meterpreter/ext_server_stdapi.php
@@ -28,8 +28,8 @@ define("TLV_TYPE_SEARCH_GLOB", TLV_META_TYPE_STRING | 1231);
define("TLV_TYPE_SEARCH_ROOT", TLV_META_TYPE_STRING | 1232);
define("TLV_TYPE_SEARCH_RESULTS", TLV_META_TYPE_GROUP | 1233);
define("TLV_TYPE_SEARCH_MTIME", TLV_META_TYPE_UINT | 1235);
-define("TLV_TYPE_SEARCH_FROM_DATE", TLV_META_TYPE_UINT | 1236);
-define("TLV_TYPE_SEARCH_TO_DATE", TLV_META_TYPE_UINT | 1237);
+define("TLV_TYPE_SEARCH_M_START_DATE", TLV_META_TYPE_UINT | 1236);
+define("TLV_TYPE_SEARCH_M_END_DATE", TLV_META_TYPE_UINT | 1237);
define("TLV_TYPE_FILE_MODE_T", TLV_META_TYPE_UINT | 1234);
##
@@ -688,9 +688,9 @@ function stdapi_fs_search($req, &$pkt) {
$glob = canonicalize_path($glob_tlv['value']);
$recurse_tlv = packet_get_tlv($req, TLV_TYPE_SEARCH_RECURSE);
$recurse = $recurse_tlv['value'];
- $sd_tlv = packet_get_tlv($req, TLV_TYPE_SEARCH_FROM_DATE);
+ $sd_tlv = packet_get_tlv($req, TLV_TYPE_SEARCH_M_START_DATE);
$sd = $sd_tlv['value'];
- $ed_tlv = packet_get_tlv($req, TLV_TYPE_SEARCH_TO_DATE);
+ $ed_tlv = packet_get_tlv($req, TLV_TYPE_SEARCH_M_END_DATE);
$ed = $ed_tlv['value'];
if (!$root) {
diff --git a/python/meterpreter/ext_server_stdapi.py b/python/meterpreter/ext_server_stdapi.py
index 80b56f1d..ad5beacf 100644
--- a/python/meterpreter/ext_server_stdapi.py
+++ b/python/meterpreter/ext_server_stdapi.py
@@ -475,8 +475,8 @@ TLV_TYPE_SEARCH_RESULTS = TLV_META_TYPE_GROUP | 1233
TLV_TYPE_FILE_MODE_T = TLV_META_TYPE_UINT | 1234
TLV_TYPE_SEARCH_MTIME = TLV_META_TYPE_UINT | 1235
-TLV_TYPE_SEARCH_FROM_DATE = TLV_META_TYPE_UINT | 1236
-TLV_TYPE_SEARCH_TO_DATE = TLV_META_TYPE_UINT | 1237
+TLV_TYPE_SEARCH_M_START_DATE = TLV_META_TYPE_UINT | 1236
+TLV_TYPE_SEARCH_M_END_DATE = TLV_META_TYPE_UINT | 1237
##
# Net
@@ -1521,8 +1521,8 @@ def stdapi_fs_search(request, response):
search_root = unicode(search_root)
glob = packet_get_tlv(request, TLV_TYPE_SEARCH_GLOB)['value']
recurse = packet_get_tlv(request, TLV_TYPE_SEARCH_RECURSE)['value']
- sd = packet_get_tlv(request,TLV_TYPE_SEARCH_FROM_DATE)['value']
- ed = packet_get_tlv(request,TLV_TYPE_SEARCH_TO_DATE)['value']
+ sd = packet_get_tlv(request,TLV_TYPE_SEARCH_M_START_DATE)['value']
+ ed = packet_get_tlv(request,TLV_TYPE_SEARCH_M_END_DATE)['value']
if recurse:
for root, dirs, files in os.walk(search_root):
for f in filter(lambda f: fnmatch.fnmatch(f, glob), files):