libtransport.git Changeset - 1045ad7b736a

Changeset - 1045ad7b736a

Parent rev.

Child rev.

[Not reviewed]

Merge

! ! !

Vitaly Takmazov - 10 years ago 2015-10-15 15:21:31
vitalyster@gmail.com

Merge branch 'master' into swiften3

5 files changed with 20 insertions and 5 deletions:

backends/libpurple/main.cpp

backends/libpurple/purple_defs.h

backends/twitter/libtwitcurl/twitcurl.cpp

cmake_modules/eventConfig.cmake

plugin/python/NetworkPlugin.py

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -497,57 +497,60 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
 						purple_conv_chat_send_wrapped(PURPLE_CONV_CHAT_WRAPPED(conv), _markup);
+					}
 					g_free(_markup);
+				}
 				else {
 					if (purple_conversation_get_type_wrapped(conv) == PURPLE_CONV_TYPE_IM) {
 						purple_conv_im_send_wrapped(PURPLE_CONV_IM_WRAPPED(conv), xhtml.c_str());
+					}
 					else if (purple_conversation_get_type_wrapped(conv) == PURPLE_CONV_TYPE_CHAT) {
 						purple_conv_chat_send_wrapped(PURPLE_CONV_CHAT_WRAPPED(conv), xhtml.c_str());
+					}
+				}
+			}
+		}
 		void handleVCardRequest(const std::string &user, const std::string &legacyName, unsigned int id) {
 			PurpleAccount *account = m_sessions[user];
 			if (account) {
 				std::string name = legacyName;
 				if (CONFIG_STRING(config, "service.protocol") == "any" && legacyName.find("prpl-") == 0) {
 					name = name.substr(name.find(".") + 1);
+				}
 				m_vcards[user + name] = id;
 				if (CONFIG_BOOL(config, "backend.no_vcard_fetch") && name != purple_account_get_username_wrapped(account)) {
 				PurplePlugin *prpl = purple_find_prpl_wrapped(purple_account_get_protocol_id_wrapped(account));
 				PurplePluginProtocolInfo *prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
 				bool support_get_info = prpl_info && prpl_info->get_info;
 				if (!support_get_info || (CONFIG_BOOL(config, "backend.no_vcard_fetch") && name != purple_account_get_username_wrapped(account))) {
 					PurpleNotifyUserInfo *user_info = purple_notify_user_info_new_wrapped();
 					notify_user_info(purple_account_get_connection_wrapped(account), name.c_str(), user_info);
 					purple_notify_user_info_destroy_wrapped(user_info);
+				}
 				else {
 					serv_get_info_wrapped(purple_account_get_connection_wrapped(account), name.c_str());
+				}
+			}
+		}
 		void handleVCardUpdatedRequest(const std::string &user, const std::string &image, const std::string &nickname) {
 			PurpleAccount *account = m_sessions[user];
 			if (account) {
 				purple_account_set_alias_wrapped(account, nickname.c_str());
 #if PURPLE_MAJOR_VERSION >= 2 && PURPLE_MINOR_VERSION >= 7
 				purple_account_set_public_alias_wrapped(account, nickname.c_str(), NULL, NULL);
 #endif
 				gssize size = image.size();
 				// this will be freed by libpurple
 				guchar *photo = (guchar *) g_malloc(size * sizeof(guchar));
 				memcpy(photo, image.c_str(), size);
 				if (!photo)
 					return;
 				purple_buddy_icons_set_account_icon_wrapped(account, photo, size);
+			}
+		}
 		void handleBuddyRemovedRequest(const std::string &user, const std::string &buddyName, const std::vector<std::string> &groups) {
 			PurpleAccount *account = m_sessions[user];
 			if (account) {
@@ @@ -614,48 +617,53 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
+					}
+				}
+			}
+		}
 		void handleTypingRequest(const std::string &user, const std::string &buddyName) {
 			PurpleAccount *account = m_sessions[user];
 			if (account) {
 				LOG4CXX_INFO(logger, user << ": sending typing notify to " << buddyName);
 				serv_send_typing_wrapped(purple_account_get_connection_wrapped(account), buddyName.c_str(), PURPLE_TYPING);
+			}
+		}
 		void handleTypedRequest(const std::string &user, const std::string &buddyName) {
 			PurpleAccount *account = m_sessions[user];
 			if (account) {
 				serv_send_typing_wrapped(purple_account_get_connection_wrapped(account), buddyName.c_str(), PURPLE_TYPED);
+			}
+		}
 		void handleStoppedTypingRequest(const std::string &user, const std::string &buddyName) {
 			PurpleAccount *account = m_sessions[user];
 			if (account) {
 				serv_send_typing_wrapped(purple_account_get_connection_wrapped(account), buddyName.c_str(), PURPLE_NOT_TYPING);
 				PurpleConversation *conv = purple_find_conversation_with_account_wrapped(PURPLE_CONV_TYPE_CHAT, buddyName.c_str(), account);
 				if (conv) {
 					purple_conversation_set_data_wrapped(conv, "unseen_count", 0);
 					purple_conversation_update_wrapped(conv, PURPLE_CONV_UPDATE_UNSEEN);
+				}
+			}
+		}
 		void handleAttentionRequest(const std::string &user, const std::string &buddyName, const std::string &message) {
 			PurpleAccount *account = m_sessions[user];
 			if (account) {
 				purple_prpl_send_attention_wrapped(purple_account_get_connection_wrapped(account), buddyName.c_str(), 0);
+			}
+		}
 		void handleJoinRoomRequest(const std::string &user, const std::string &room, const std::string &nickname, const std::string &pasword) {
 			PurpleAccount *account = m_sessions[user];
 			if (!account) {
 				return;
+			}
 			PurpleConnection *gc = purple_account_get_connection_wrapped(account);
 			GHashTable *comps = NULL;
 			// Check if the PurpleChat is not stored in buddy list
 			PurpleChat *chat = purple_blist_find_chat_wrapped(account, room.c_str());
 			if (chat) {
 				comps = purple_chat_get_components_wrapped(chat);
+			}

backends/libpurple/purple_defs.h

➞

Show inline comments

 typedef const char * (_cdecl * purple_connection_get_display_name_wrapped_fnc)(const PurpleConnection *gc);
 extern purple_connection_get_display_name_wrapped_fnc purple_connection_get_display_name_wrapped;
 typedef void  (_cdecl * purple_connections_set_ui_ops_wrapped_fnc)(PurpleConnectionUiOps *ops);
 extern purple_connections_set_ui_ops_wrapped_fnc purple_connections_set_ui_ops_wrapped;
 typedef void * (_cdecl * purple_connections_get_handle_wrapped_fnc)(void);
 extern purple_connections_get_handle_wrapped_fnc purple_connections_get_handle_wrapped;
 typedef PurpleConvIm * (_cdecl * purple_conversation_get_im_data_wrapped_fnc)(const PurpleConversation *conv);
 extern purple_conversation_get_im_data_wrapped_fnc purple_conversation_get_im_data_wrapped;
 typedef PurpleConvChat * (_cdecl * purple_conversation_get_chat_data_wrapped_fnc)(const PurpleConversation *conv);
 extern purple_conversation_get_chat_data_wrapped_fnc purple_conversation_get_chat_data_wrapped;
 typedef PurpleConversation * (_cdecl * purple_find_conversation_with_account_wrapped_fnc)( PurpleConversationType type, const char *name, const PurpleAccount *account);
 extern purple_find_conversation_with_account_wrapped_fnc purple_find_conversation_with_account_wrapped;
 typedef PurpleConversation * (_cdecl * purple_conversation_new_wrapped_fnc)(PurpleConversationType type, PurpleAccount *account, const char *name);
 extern purple_conversation_new_wrapped_fnc purple_conversation_new_wrapped;
 typedef PurpleConversationType  (_cdecl * purple_conversation_get_type_wrapped_fnc)(const PurpleConversation *conv);
 extern purple_conversation_get_type_wrapped_fnc purple_conversation_get_type_wrapped;
 typedef void (_cdecl * purple_conversation_set_data_wrapped_func)(const PurpleConversation *conv, const char *key, gpointer data);
 extern purple_conversation_set_data_wrapped_func purple_conversation_set_data_wrapped;
 typedef void (_cdecl * purple_conversation_update_wrapped_func)(const PurpleConversation *conv, PurpleConversationUpdateType type);
 extern purple_conversation_update_wrapped_func purple_conversation_update_wrapped;
 typedef void  (_cdecl * purple_conv_im_send_wrapped_fnc)(PurpleConvIm *im, const char *message);
 extern purple_conv_im_send_wrapped_fnc purple_conv_im_send_wrapped;
 typedef void  (_cdecl * purple_conv_chat_send_wrapped_fnc)(PurpleConvChat *chat, const char *message);
 extern purple_conv_chat_send_wrapped_fnc purple_conv_chat_send_wrapped;
 typedef void  (_cdecl * purple_conversation_destroy_wrapped_fnc)(PurpleConversation *conv);
 extern purple_conversation_destroy_wrapped_fnc purple_conversation_destroy_wrapped;
 typedef PurpleAccount * (_cdecl * purple_conversation_get_account_wrapped_fnc)(const PurpleConversation *conv);
 extern purple_conversation_get_account_wrapped_fnc purple_conversation_get_account_wrapped;
 typedef const char * (_cdecl * purple_conversation_get_name_wrapped_fnc)(const PurpleConversation *conv);
 extern purple_conversation_get_name_wrapped_fnc purple_conversation_get_name_wrapped;
 typedef void  (_cdecl * purple_conversations_set_ui_ops_wrapped_fnc)(PurpleConversationUiOps *ops);
 extern purple_conversations_set_ui_ops_wrapped_fnc purple_conversations_set_ui_ops_wrapped;
 typedef void * (_cdecl * purple_conversations_get_handle_wrapped_fnc)(void);
 extern purple_conversations_get_handle_wrapped_fnc purple_conversations_get_handle_wrapped;
 typedef void  (_cdecl * purple_core_set_ui_ops_wrapped_fnc)(PurpleCoreUiOps *ops);
 extern purple_core_set_ui_ops_wrapped_fnc purple_core_set_ui_ops_wrapped;
 #define purple_find_buddies_wrapped purple_find_buddies
 #define purple_group_get_name_wrapped purple_group_get_name
 #define purple_blist_set_ui_ops_wrapped purple_blist_set_ui_ops
 #define purple_set_blist_wrapped purple_set_blist
 #define purple_blist_new_wrapped purple_blist_new
 #define purple_blist_load_wrapped purple_blist_load
 #define purple_blist_get_handle_wrapped purple_blist_get_handle
 #define purple_buddy_icons_set_account_icon_wrapped purple_buddy_icons_set_account_icon
 #define purple_buddy_icons_find_wrapped purple_buddy_icons_find
 #define purple_buddy_icon_get_full_path_wrapped purple_buddy_icon_get_full_path
 #define purple_buddy_icon_unref_wrapped purple_buddy_icon_unref
 #define purple_buddy_icons_find_account_icon_wrapped purple_buddy_icons_find_account_icon
 #define purple_buddy_icon_get_data_wrapped purple_buddy_icon_get_data
 #define purple_certificate_add_ca_search_path_wrapped purple_certificate_add_ca_search_path
 #define purple_connection_get_state_wrapped purple_connection_get_state
 #define purple_connection_get_account_wrapped purple_connection_get_account
 #define purple_connection_get_display_name_wrapped purple_connection_get_display_name
 #define purple_connections_set_ui_ops_wrapped purple_connections_set_ui_ops
 #define purple_connections_get_handle_wrapped purple_connections_get_handle
 #define purple_conversation_get_im_data_wrapped purple_conversation_get_im_data
 #define purple_conversation_get_chat_data_wrapped purple_conversation_get_chat_data
 #define purple_find_conversation_with_account_wrapped purple_find_conversation_with_account
 #define purple_conversation_new_wrapped purple_conversation_new
 #define purple_conversation_get_type_wrapped purple_conversation_get_type
 #define purple_conversation_set_data_wrapped purple_conversation_set_data
 #define purple_conversation_update_wrapped purple_conversation_update
 #define purple_conv_im_send_wrapped purple_conv_im_send
 #define purple_conv_chat_send_wrapped purple_conv_chat_send
 #define purple_conversation_destroy_wrapped purple_conversation_destroy
 #define purple_conversation_get_account_wrapped purple_conversation_get_account
 #define purple_conversation_get_name_wrapped purple_conversation_get_name
 #define purple_conversations_set_ui_ops_wrapped purple_conversations_set_ui_ops
 #define purple_conversations_get_handle_wrapped purple_conversations_get_handle
 #define purple_core_set_ui_ops_wrapped purple_core_set_ui_ops
 #define purple_core_init_wrapped purple_core_init
 #define purple_debug_set_ui_ops_wrapped purple_debug_set_ui_ops
 #define purple_debug_set_verbose_wrapped purple_debug_set_verbose
 #define purple_dnsquery_set_ui_ops_wrapped purple_dnsquery_set_ui_ops
 #define purple_timeout_remove_wrapped purple_timeout_remove
 #define purple_input_add_wrapped purple_input_add
 #define purple_timeout_add_wrapped purple_timeout_add
 #define purple_timeout_add_seconds_wrapped purple_timeout_add_seconds
 #define purple_eventloop_set_ui_ops_wrapped purple_eventloop_set_ui_ops
 #define purple_input_remove_wrapped purple_input_remove
 #define purple_xfer_ui_ready_wrapped purple_xfer_ui_ready
 #define purple_xfer_request_accepted_wrapped purple_xfer_request_accepted
 #define purple_xfer_request_denied_wrapped purple_xfer_request_denied
 #define purple_xfer_get_account_wrapped purple_xfer_get_account
 #define purple_xfer_get_filename_wrapped purple_xfer_get_filename
 #define purple_xfer_get_size_wrapped purple_xfer_get_size

backends/twitter/libtwitcurl/twitcurl.cpp

➞

Show inline comments

 #define NOMINMAX
 #include <algorithm>
 #include <memory.h>
 #include "twitcurlurls.h"
 #include "twitcurl.h"
 #include "urlencode.h"
 /*++
 * @method: twitCurl::twitCurl
+*
 * @description: constructor
+*
 * @input: none
+*
 * @output: none
+*
 *--*/
 twitCurl::twitCurl():
 m_curlHandle( NULL ),
 m_curlProxyParamsSet( false ),
 m_curlLoginParamsSet( false ),
 m_curlCallbackParamsSet( false ),
 m_eApiFormatType( twitCurlTypes::eTwitCurlApiFormatJson ),
 m_eProtocolType( twitCurlTypes::eTwitCurlProtocolHttps )
+{
     /* Alloc memory for cURL error responses */

cmake_modules/eventConfig.cmake

➞

Show inline comments

 FIND_PATH(EVENT_INCLUDE_DIRS event.h PATH_SUFFIXES libev)
+FIND_PATH(EVENT_INCLUDE_DIRS event.h ev.h PATH_SUFFIXES libev)
 SET(EVENT_NAMES ${EVENT_NAMES} ev libev)
 FIND_LIBRARY(EVENT_LIBRARIES NAMES ${EVENT_NAMES} PATH)
 IF(EVENT_INCLUDE_DIRS AND EVENT_LIBRARIES)
 SET(HAVE_EVENT TRUE)
 file(APPEND src/transport_config.h "#define WITH_LIBEVENT 1\n")
 ELSE(EVENT_INCLUDE_DIRS AND EVENT_LIBRARIES)
 SET (EVENT_INCLUDE_DIRS "")
 SET (EVENT_LIBRARIES "")
 ENDIF(EVENT_INCLUDE_DIRS AND EVENT_LIBRARIES)
 IF(HAVE_EVENT)
 MESSAGE(STATUS "Found Event: ${EVENT_LIBRARIES} ${EVENT_INCLUDE_DIRS}")
 ENDIF(HAVE_EVENT)

plugin/python/NetworkPlugin.py

➞

Show inline comments

@@ @@ -298,49 +298,49 @@ class NetworkPlugin: @@
 		payload = protocol_pb2.Buddy()
 		if (payload.ParseFromString(data) == False):
 			#TODO: ERROR
 			return
 		if msgType == protocol_pb2.WrapperMessage.TYPE_BUDDY_TYPING:
 				self.handleTypingRequest(payload.userName, payload.buddyName)
 		elif  msgType == protocol_pb2.WrapperMessage.TYPE_BUDDY_TYPED:
 				self.handleTypedRequest(payload.userName, payload.buddyName)
 		elif msgType == protocol_pb2.WrapperMessage.TYPE_BUDDY_STOPPED_TYPING:
 				self.handleStoppedTypingRequest(payload.userName, payload.buddyName)
 	def handleDataRead(self, data):
 		self.m_data += data
 		while len(self.m_data) != 0:
 			expected_size = 0
 			if (len(self.m_data) >= 4):
 				expected_size = struct.unpack('!I', self.m_data[0:4])[0]
 				if (len(self.m_data) - 4 < expected_size):
 					return
 			else:
 				return
 			wrapper = protocol_pb2.WrapperMessage()
 			if (wrapper.ParseFromString(self.m_data[4:]) == False):
+			if (wrapper.ParseFromString(self.m_data[4:expected_size+4]) == False):
 				self.m_data = self.m_data[expected_size+4:]
 				return
 			self.m_data = self.m_data[4+expected_size:]
 			if wrapper.type == protocol_pb2.WrapperMessage.TYPE_LOGIN:
 					self.handleLoginPayload(wrapper.payload)
 			elif wrapper.type == protocol_pb2.WrapperMessage.TYPE_LOGOUT:
 					self.handleLogoutPayload(wrapper.payload)
 			elif wrapper.type == protocol_pb2.WrapperMessage.TYPE_PING:
 					self.sendPong()
 			elif wrapper.type == protocol_pb2.WrapperMessage.TYPE_CONV_MESSAGE:
 					self.handleConvMessagePayload(wrapper.payload)
 			elif wrapper.type == protocol_pb2.WrapperMessage.TYPE_JOIN_ROOM:
 					self.handleJoinRoomPayload(wrapper.payload)
 			elif wrapper.type == protocol_pb2.WrapperMessage.TYPE_LEAVE_ROOM:
 					self.handleLeaveRoomPayload(wrapper.payload)
 			elif wrapper.type == protocol_pb2.WrapperMessage.TYPE_VCARD:
 					self.handleVCardPayload(wrapper.payload)
 			elif wrapper.type == protocol_pb2.WrapperMessage.TYPE_BUDDY_CHANGED:
 					self.handleBuddyChangedPayload(wrapper.payload)
 			elif wrapper.type == protocol_pb2.WrapperMessage.TYPE_BUDDY_REMOVED:
 					self.handleBuddyRemovedPayload(wrapper.payload)
 			elif wrapper.type == protocol_pb2.WrapperMessage.TYPE_STATUS_CHANGED:

0 comments (0 inline, 0 general)