Max/djhackersdev_bemanitools
1
0
Fork 0
Code Issues 72 Pull Requests 15 Actions Packages Projects Releases 20 Wiki Activity

formatting update

Browse Source
This commit is contained in:
Will Xyen
2020-01-28 04:25:25 -05:00
parent 78374492a1
commit bcbd5178d1
5 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/hooklib/adapter.c
+23 -6
View File
@@ -49,9 +49,19 @@ my_GetAdaptersInfo(PIP_ADAPTER_INFO adapter_info, PULONG out_buf_len)
if (use_address_override) {
while (info) {
// this is well defined to be at most sizeof(IP_ADDRESS_STRING)
// and NULL filled if shorter (hence the memset in adapter_hook_override)
if (!memcmp(info->IpAddressList.IpAddress.String, override_address.String, sizeof(IP_ADDRESS_STRING))) {
log_info("%s: using [override] adapter: %s, %s, %s, %s", __FUNCTION__, info->AdapterName, info->Description, info->IpAddressList.IpAddress.String, info->IpAddressList.IpMask.String);
// and NULL filled if shorter (hence the memset in
// adapter_hook_override)
if (!memcmp(
info->IpAddressList.IpAddress.String,
override_address.String,
sizeof(IP_ADDRESS_STRING))) {
log_info(
"%s: using [override] adapter: %s, %s, %s, %s",
__FUNCTION__,
info->AdapterName,
info->Description,
info->IpAddressList.IpAddress.String,
info->IpAddressList.IpMask.String);
// copy only this adapter over
memcpy(adapter_info, info, sizeof(*info));
@@ -83,7 +93,13 @@ my_GetAdaptersInfo(PIP_ADAPTER_INFO adapter_info, PULONG out_buf_len)
while (info) {
if (info->Index == best_adapter) {
log_info("%s: using [best] adapter: %s, %s, %s, %s", __FUNCTION__, info->AdapterName, info->Description, info->IpAddressList.IpAddress.String, info->IpAddressList.IpMask.String);
log_info(
"%s: using [best] adapter: %s, %s, %s, %s",
__FUNCTION__,
info->AdapterName,
info->Description,
info->IpAddressList.IpAddress.String,
info->IpAddressList.IpMask.String);
// copy only this adapter over
memcpy(adapter_info, info, sizeof(*info));
@@ -102,7 +118,7 @@ void adapter_hook_init(void)
NULL, "iphlpapi.dll", adapter_hook_syms, lengthof(adapter_hook_syms));
}
void adapter_hook_override(const char* adapter_address)
void adapter_hook_override(const char *adapter_address)
{
// starts off false anyways due to static
// but in case it gets called multiple times, set it anyways
@@ -113,7 +129,8 @@ void adapter_hook_override(const char* adapter_address)
return;
}
if (strlen(adapter_address) > sizeof(IP_ADDRESS_STRING)) {
log_warning("%s: %s is not an ipv4 address", __FUNCTION__, adapter_address);
log_warning(
"%s: %s is not an ipv4 address", __FUNCTION__, adapter_address);
return;
}
src/main/hooklib/adapter.h
+1 -1
View File
@@ -8,6 +8,6 @@ void adapter_hook_init(void);
*
* @param network ip to match
*/
void adapter_hook_override(const char* adapter_address);
void adapter_hook_override(const char *adapter_address);
#endif
src/main/hooklib/config-adapter.c
+2 -1
View File
@@ -17,7 +17,8 @@ void hooklib_config_adapter_init(struct cconfig *config)
"IP of adapter to force override with");
}
void hooklib_config_adapter_get(struct hooklib_config_adapter *config_adapter, struct cconfig *config)
void hooklib_config_adapter_get(
struct hooklib_config_adapter *config_adapter, struct cconfig *config)
{
if (!cconfig_util_get_str(
config,
src/main/hooklib/config-adapter.h
+2 -1
View File
@@ -12,6 +12,7 @@ struct hooklib_config_adapter {
void hooklib_config_adapter_init(struct cconfig *config);
void hooklib_config_adapter_get(struct hooklib_config_adapter *config_adapter, struct cconfig *config);
void hooklib_config_adapter_get(
struct hooklib_config_adapter *config_adapter, struct cconfig *config);
#endif