- first commit for pavo changes

pull/6/head
Michael Zillgith 10 years ago
parent 16fe7c2a7c
commit 7eeac08551

@ -21,7 +21,7 @@
#define DEBUG_IED_CLIENT 0 #define DEBUG_IED_CLIENT 0
#define DEBUG_MMS_CLIENT 0 #define DEBUG_MMS_CLIENT 0
#define DEBUG_MMS_SERVER 0 #define DEBUG_MMS_SERVER 0
#define DEBUG_GOOSE_SUBSCRIBER 0 #define DEBUG_GOOSE_SUBSCRIBER 1
#define DEBUG_GOOSE_PUBLISHER 0 #define DEBUG_GOOSE_PUBLISHER 0
/* Maximum MMS PDU SIZE - default is 65000 */ /* Maximum MMS PDU SIZE - default is 65000 */

@ -201,6 +201,7 @@ prepareGooseBuffer(GoosePublisher self, CommParameters* parameters, const char*
int bufPos = 12; int bufPos = 12;
#if 0
/* Priority tag - IEEE 802.1Q */ /* Priority tag - IEEE 802.1Q */
self->buffer[bufPos++] = 0x81; self->buffer[bufPos++] = 0x81;
self->buffer[bufPos++] = 0x00; self->buffer[bufPos++] = 0x00;
@ -212,6 +213,7 @@ prepareGooseBuffer(GoosePublisher self, CommParameters* parameters, const char*
self->buffer[bufPos++] = tci1; /* Priority + VLAN-ID */ self->buffer[bufPos++] = tci1; /* Priority + VLAN-ID */
self->buffer[bufPos++] = tci2; /* VLAN-ID */ self->buffer[bufPos++] = tci2; /* VLAN-ID */
#endif
/* EtherType GOOSE */ /* EtherType GOOSE */
self->buffer[bufPos++] = 0x88; self->buffer[bufPos++] = 0x88;

@ -752,7 +752,6 @@ GooseReceiver_destroy(GooseReceiver self)
void void
GooseReceiver_startThreadless(GooseReceiver self) GooseReceiver_startThreadless(GooseReceiver self)
{ {
if (self->interfaceId == NULL) if (self->interfaceId == NULL)
self->ethSocket = Ethernet_createSocket(CONFIG_ETHERNET_INTERFACE_ID, NULL); self->ethSocket = Ethernet_createSocket(CONFIG_ETHERNET_INTERFACE_ID, NULL);
else else

@ -604,21 +604,37 @@ IedConnection_close(IedConnection self)
void void
IedConnection_destroy(IedConnection self) IedConnection_destroy(IedConnection self)
{ {
printf("D1\n");
IedConnection_close(self); IedConnection_close(self);
printf("D2\n");
MmsConnection_destroy(self->connection); MmsConnection_destroy(self->connection);
printf("D3\n");
if (self->logicalDevices != NULL) if (self->logicalDevices != NULL)
LinkedList_destroyDeep(self->logicalDevices, (LinkedListValueDeleteFunction) ICLogicalDevice_destroy); LinkedList_destroyDeep(self->logicalDevices, (LinkedListValueDeleteFunction) ICLogicalDevice_destroy);
printf("D4\n");
#if 0
if (self->enabledReports != NULL) if (self->enabledReports != NULL)
LinkedList_destroyDeep(self->enabledReports, (LinkedListValueDeleteFunction) ClientReport_destroy); LinkedList_destroyDeep(self->enabledReports, (LinkedListValueDeleteFunction) ClientReport_destroy);
#endif
LinkedList_destroyStatic(self->clientControls); LinkedList_destroyStatic(self->clientControls);
printf("D6\n");
Semaphore_destroy(self->stateMutex); Semaphore_destroy(self->stateMutex);
printf("D7\n");
GLOBAL_FREEMEM(self); GLOBAL_FREEMEM(self);
printf("D8\n");
} }
MmsVariableSpecification* MmsVariableSpecification*

Loading…
Cancel
Save