X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=crypt.cpp;h=051dbb321bc7c26e7b6ccc8738c33c77bbeb639e;hp=7868ceb9022d5b874daa66b8673a28bb6ead82a6;hb=1bfbfbf903777d13df3107fbc89bdaeb2af9f2d6;hpb=ef3fc1931a2fa82f482d21fb1296735206463d3a

diff --git a/crypt.cpp b/crypt.cpp
index 7868ceb..051dbb3 100644
--- a/crypt.cpp
+++ b/crypt.cpp
@@ -1524,7 +1524,7 @@ void EndpointAppPBX::cryptman_msg2user(int msg, char *text)
 {
 	struct message *message;
 	/* send message */
-	message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_call_id, EPOINT_TO_CALL, MESSAGE_CRYPT);
+	message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_CRYPT);
 	message->param.crypt.type = msg;
 	if (!text)
 		text = "";
@@ -1803,7 +1803,7 @@ void EndpointAppPBX::encrypt_shared(void)
 	if (e_crypt != CRYPT_OFF)
 	{
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) encryption in progress, so we request the current message.\n", ea_endpoint->ep_serial);
-		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_call_id, EPOINT_TO_CALL, MESSAGE_CRYPT);
+		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_CRYPT);
 		message->param.crypt.type = CU_INFO_REQ;
 		message_put(message);
 		return;
@@ -1885,7 +1885,7 @@ void EndpointAppPBX::encrypt_shared(void)
 //	SPRINT(e_crypt_display, "Shared Key");
 	e_crypt = CRYPT_SWAIT;
 	/* sending activation */
-	message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_call_id, EPOINT_TO_CALL, MESSAGE_CRYPT);
+	message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_CRYPT);
 	message->param.crypt.type = CU_ACTS_REQ;
 	message->param.crypt.len = key_len;
 	memcpy(message->param.crypt.data, key, key_len);
@@ -1905,7 +1905,7 @@ void EndpointAppPBX::encrypt_keyex(void)
 	if (e_crypt != CRYPT_OFF)
 	{
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) encryption in progress, so we request the current message.\n", ea_endpoint->ep_serial);
-		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_call_id, EPOINT_TO_CALL, MESSAGE_CRYPT);
+		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_CRYPT);
 		message->param.crypt.type = CU_INFO_REQ;
 		message_put(message);
 		return;
@@ -1937,7 +1937,7 @@ void EndpointAppPBX::encrypt_keyex(void)
 	message_put(message);
 	e_crypt = CRYPT_KWAIT;
 	/* sending activation */
-	message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_call_id, EPOINT_TO_CALL, MESSAGE_CRYPT);
+	message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_CRYPT);
 	message->param.crypt.type = CU_ACTK_REQ;
 	message_put(message);
 #endif /* CRYPTO */
@@ -1975,7 +1975,7 @@ void EndpointAppPBX::encrypt_off(void)
 	message_put(message);
 	e_crypt = CRYPT_RELEASE;
 	/* sending activation */
-	message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_call_id, EPOINT_TO_CALL, MESSAGE_CRYPT);
+	message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_CRYPT);
 	message->param.crypt.type = CU_DACT_REQ;
 	message_put(message);
 }