Skip to content

Commit

Permalink
Fixes error in CMakeList and changes return type of SetQosOnSocket fr…
Browse files Browse the repository at this point in the history 
…om void to int
  • Loading branch information
@peda1337
peda1337 committed Feb 6, 2018
1 parent 43230c9 commit bc08f0d
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 71 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ Compile for Windows XP/7/8:
2. Open Visual Studio solution in bin/win32
3. For invoking opener type in command line:

OpENer ipaddress subnetmask gateway domainname hostaddress macaddress
OpENer interface_index

e.g. OpENer 192.168.0.2 255.255.255.0 192.168.0.1 test.com testdevice 00 15 C5 BF D0 87
e.g. OpENer 3

Directory structure:
--------------------
Expand Down
2 changes: 1 addition & 1 deletion source/src/ports/WIN32/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ add_library( ${PLATFORMLIBNAME} ${PLATFORM_SPEC_SRC})

add_executable(OpENer main.c)

target_link_libraries( OpENer PLATFORM_GENERIC ${PLATFORMLIBNAME} CIP SAMPLE_APP ENET_ENCAP ws2_32 ${OpENer_CIP_OBJECTS} )
target_link_libraries( OpENer PLATFORM_GENERIC ${PLATFORMLIBNAME} CIP Utils SAMPLE_APP ENET_ENCAP ws2_32 ${OpENer_CIP_OBJECTS} )
3 changes: 3 additions & 0 deletions source/src/ports/WIN32/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ int main(int argc,
" e.g. ./OpENer index\n");
exit(0);
} else {
DoublyLinkedListInitialize(&connection_list,
CipConnectionObjectListArrayAllocator,
CipConnectionObjectListArrayFree);
/* fetch Internet address info from the platform */
ConfigureDomainName(atoi(arg[1]));
ConfigureHostName(atoi(arg[1]));
Expand Down
89 changes: 24 additions & 65 deletions source/src/ports/WIN32/networkconfig.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
#pragma comment(lib, "Ws2_32.lib")


void ConfigureIpMacAddress(const EipUint16 interface_index) {
void ConfigureIpMacAddress(const CipUint interface_index) {

PIP_ADAPTER_INFO pAdapterInfo;
PIP_ADAPTER_INFO pAdapter = NULL;
DWORD dwRetVal = 0;
CipDword dwRetVal = 0;

ULONG ulOutBufLen = sizeof(IP_ADAPTER_INFO);
CipUdint ulOutBufLen = sizeof(IP_ADAPTER_INFO);
pAdapterInfo = (IP_ADAPTER_INFO *)CipCalloc(1,sizeof(IP_ADAPTER_INFO));
if (pAdapterInfo == NULL) {
printf("Error allocating memory needed to call GetAdaptersinfo\n");
Expand All @@ -42,7 +42,7 @@ void ConfigureIpMacAddress(const EipUint16 interface_index) {
// the necessary size into the ulOutBufLen variable
if (GetAdaptersInfo(pAdapterInfo, &ulOutBufLen) == ERROR_BUFFER_OVERFLOW) {
CipFree(pAdapterInfo);
pAdapterInfo = (IP_ADAPTER_INFO *)CipCalloc(ulOutBufLen,sizeof(CipLint));
pAdapterInfo = (IP_ADAPTER_INFO *)CipCalloc(ulOutBufLen,sizeof(CipUdint));
if (pAdapterInfo == NULL) {
printf("Error allocating memory needed to call GetAdaptersinfo\n");
return 1;
Expand All @@ -63,7 +63,7 @@ void ConfigureIpMacAddress(const EipUint16 interface_index) {
interface_configuration_.network_mask = inet_addr(pAdapter->IpAddressList.IpMask.String);
interface_configuration_.gateway = inet_addr(pAdapter->GatewayList.IpAddress.String);

EipUint32 host_id = ntohl(interface_configuration_.ip_address)
CipUdint host_id = ntohl(interface_configuration_.ip_address)
& ~ntohl(interface_configuration_.network_mask); /* see CIP spec 3-5.3 for multicast address algorithm*/
host_id -= 1;
host_id &= 0x3ff;
Expand All @@ -82,28 +82,23 @@ void ConfigureIpMacAddress(const EipUint16 interface_index) {
CipFree(pAdapter);
}

void ConfigureDomainName(const EipUint16 interface_index) {
void ConfigureDomainName(const CipUint interface_index) {

DWORD dwSize = 0;
CipDword dwSize = 0;
int i = 0;
// Set the flags to pass to GetAdaptersAddresses
ULONG flags = GAA_FLAG_INCLUDE_PREFIX;
DWORD dwRetVal = 0;
CipUdint flags = GAA_FLAG_INCLUDE_PREFIX;
CipDword dwRetVal = 0;
// default to unspecified address family (both)
ULONG family = AF_UNSPEC;
CipUdint family = AF_UNSPEC;

LPVOID lpMsgBuf = NULL;

PIP_ADAPTER_ADDRESSES pAddresses = NULL;
ULONG outBufLen = 0;
ULONG Iterations = 0;

PIP_ADAPTER_ADDRESSES pCurrAddresses = NULL;
PIP_ADAPTER_UNICAST_ADDRESS pUnicast = NULL;
PIP_ADAPTER_ANYCAST_ADDRESS pAnycast = NULL;
PIP_ADAPTER_MULTICAST_ADDRESS pMulticast = NULL;
IP_ADAPTER_DNS_SERVER_ADDRESS *pDnServer = NULL;
IP_ADAPTER_PREFIX *pPrefix = NULL;
CipUdint outBufLen = 0;
CipUdint tries = 0;

family = AF_INET;
// Allocate a 15 KB buffer to start with.
Expand All @@ -129,9 +124,9 @@ void ConfigureDomainName(const EipUint16 interface_index) {
break;
}

Iterations++;
tries++;

} while ((dwRetVal == ERROR_BUFFER_OVERFLOW) && (Iterations < MAX_TRIES));
} while ((dwRetVal == ERROR_BUFFER_OVERFLOW) && (tries < MAX_TRIES));

if (dwRetVal == NO_ERROR) {
// If successful, output some information from the data we received
Expand All @@ -155,8 +150,8 @@ void ConfigureDomainName(const EipUint16 interface_index) {
}
interface_configuration_.domain_name.length = strlen(pCurrAddresses->DnsSuffix);
if (interface_configuration_.domain_name.length) {
interface_configuration_.domain_name.string = (EipByte *)CipCalloc(
interface_configuration_.domain_name.length + 1, sizeof(EipInt8));
interface_configuration_.domain_name.string = (CipByte *)CipCalloc(
interface_configuration_.domain_name.length + 1, sizeof(CipUsint));
strcpy(interface_configuration_.domain_name.string, pCurrAddresses->DnsSuffix);
}
else {
Expand All @@ -167,60 +162,24 @@ void ConfigureDomainName(const EipUint16 interface_index) {
InetNtop(AF_INET, pCurrAddresses->FirstDnsServerAddress->Next->Address.lpSockaddr->sa_data + 2, interface_configuration_.name_server_2, sizeof(interface_configuration_.name_server_2));
}
else interface_configuration_.domain_name.length = 0;

if (pCurrAddresses->PhysicalAddressLength != 0) {
printf("\tPhysical address: ");
for (int i = 0; i < (int)pCurrAddresses->PhysicalAddressLength;
i++) {
if (i == (pCurrAddresses->PhysicalAddressLength - 1))
printf("%.2X\n",
(int)pCurrAddresses->PhysicalAddress[i]);
else
printf("%.2X-",
(int)pCurrAddresses->PhysicalAddress[i]);
}
}
/* printf("\tFlags: %ld\n", pCurrAddresses->Flags);
printf("\tMtu: %lu\n", pCurrAddresses->Mtu);
printf("\tIfType: %ld\n", pCurrAddresses->IfType);
printf("\tOperStatus: %ld\n", pCurrAddresses->OperStatus);
printf("\tIpv6IfIndex (IPv6 interface): %u\n",
pCurrAddresses->Ipv6IfIndex);
printf("\tZoneIndices (hex): ");
for (i = 0; i < 16; i++)
printf("%lx ", pCurrAddresses->ZoneIndices[i]);
printf("\n");
printf("\tTransmit link speed: %I64u\n", pCurrAddresses->TransmitLinkSpeed);
printf("\tReceive link speed: %I64u\n", pCurrAddresses->ReceiveLinkSpeed);
pPrefix = pCurrAddresses->FirstPrefix;
if (pPrefix) {
for (i = 0; pPrefix != NULL; i++)
pPrefix = pPrefix->Next;
printf("\tNumber of IP Adapter Prefix entries: %d\n", i);
}
else
printf("\tNumber of IP Adapter Prefix entries: 0\n");*/

printf("\n");

}
pCurrAddresses = pCurrAddresses->Next;
}
}
else {
printf("Call to GetAdaptersAddresses failed with error: %d\n",
OPENER_TRACE_INFO("Call to GetAdaptersAddresses failed with error: %d\n",
dwRetVal);
if (dwRetVal == ERROR_NO_DATA)
printf("\tNo addresses were found for the requested parameters\n");
OPENER_TRACE_INFO("\tNo addresses were found for the requested parameters\n");
else {

if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
NULL, dwRetVal, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
// Default language
(LPTSTR)& lpMsgBuf, 0, NULL)) {
printf("\tError: %s", lpMsgBuf);
OPENER_TRACE_INFO("\tError: %s", lpMsgBuf);
CipFree(lpMsgBuf);
if (pAddresses)
CipFree(pAddresses);
Expand All @@ -236,8 +195,8 @@ void ConfigureDomainName(const EipUint16 interface_index) {

}

void ConfigureHostName(const EipUint16 interface_index) {
WORD wVersionRequested;
void ConfigureHostName(const CipUint interface_index) {
CipWord wVersionRequested;
WSADATA wsaData;
int err;

Expand Down Expand Up @@ -269,8 +228,8 @@ void ConfigureHostName(const EipUint16 interface_index) {
}
hostname_.length = strlen(hostname);
if (hostname_.length) {
hostname_.string = (EipByte *) CipCalloc( hostname_.length + 1,
sizeof(EipByte) );
hostname_.string = (CipByte *) CipCalloc( hostname_.length + 1,
sizeof(CipByte) );
strcpy(hostname_.string, hostname);
} else {
hostname_.string = NULL;
Expand Down
4 changes: 2 additions & 2 deletions source/src/ports/WIN32/networkhandler.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ int SetSocketToNonBlocking(int socket_handle) {
return ioctlsocket(socket_handle, FIONBIO, &iMode);
}

void SetQosOnSocket(int socket,
int SetQosOnSocket(int socket,
CipUsint qos_value) {
CipUsint set_tos = qos_value;
setsockopt(socket, IPPROTO_IP, IP_TOS, &set_tos, sizeof(set_tos) );
return setsockopt(socket, IPPROTO_IP, IP_TOS, &set_tos, sizeof(set_tos) );
}
2 changes: 1 addition & 1 deletion source/src/ports/WIN32/networkhandler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ MicroSeconds GetMicroSeconds(void);
*/
MilliSeconds GetMilliSeconds(void);

void SetQosOnSocket(int socket,
int SetQosOnSocket(int socket,
CipUsint qos_value);

#endif /*NETWORKHANDLER_H_*/

0 comments on commit bc08f0d

Please sign in to comment.