Просмотр исходного кода

Pointer to Session from SecureChannel

Julius Pfrommer лет назад: 11
Родитель
Сommit
d83f974cf8
2 измененных файлов с 7 добавлено и 2 удалено
  1. 5 1
      src/ua_connection.h
  2. 2 1
      src/ua_secureLayer.c

+ 5 - 1
src/ua_connection.h

@@ -55,13 +55,17 @@ typedef struct T_UA_TL_connection
 	struct T_SL_Channel* secureChannel;
 } UA_TL_connection;
 
+struct UA_Session {
+	UA_Int32 dummy;
+	UA_Application *application;
+}
 
 /* Secure Layer Channel */
 typedef struct T_SL_Channel
 {
 	UA_String secureChannelId;
 	UA_TL_connection* tlConnection;
-	UA_Application *application; // points to the application iff the session is active.
+	UA_Session *session; // equals UA_Null iff no session is active
 
 	UA_AsymmetricAlgorithmSecurityHeader remoteAsymAlgSettings;
 	UA_AsymmetricAlgorithmSecurityHeader localAsymAlgSettings;

+ 2 - 1
src/ua_secureLayer.c

@@ -149,7 +149,8 @@ START_HANDLER(Browse)
 END_HANDLER
 
 START_HANDLER(Read)
-	 service_read(channel->application, p, r);
+     // FIXME: Check if session is active 
+	 service_read(channel->session->application, p, r);
 END_HANDLER
 
 START_HANDLER(CreateSubscription)