summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/MirOTR/src/dbfilter.cpp300
-rw-r--r--plugins/MirOTR/src/language.h3
-rw-r--r--plugins/MirOTR/src/utils.cpp4
3 files changed, 118 insertions, 189 deletions
diff --git a/plugins/MirOTR/src/dbfilter.cpp b/plugins/MirOTR/src/dbfilter.cpp
index 57ff93e159..bfdfd10f07 100644
--- a/plugins/MirOTR/src/dbfilter.cpp
+++ b/plugins/MirOTR/src/dbfilter.cpp
@@ -1,7 +1,7 @@
#include "stdafx.h"
static HANDLE hDBEventPreAdd, hDBEventAdded, hContactSettingChanged;
-static mir_cs RemoveChainCS, *lpRemoveChainCS = &RemoveChainCS;
+static mir_cs RemoveChainCS;
static UINT_PTR timerId = 0;
struct DeleteEventNode {
@@ -18,7 +18,7 @@ static DeleteEventHead DeleteEvents = {0,0};
VOID CALLBACK DeleteTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) {
if (!DeleteEvents.first) return;
- mir_cslock lck(*lpRemoveChainCS);
+ mir_cslock lck(RemoveChainCS);
DeleteEventNode *prev =0, *current, *next;
DBEVENTINFO info = { sizeof(info) };
next = DeleteEvents.first;
@@ -51,7 +51,7 @@ int OnDatabaseEventPreAdd(WPARAM hContact, LPARAM lParam)
if ((dbei->eventType != EVENTTYPE_MESSAGE) || !(dbei->flags & DBEF_SENT) || (dbei->flags & DBEF_OTR_PREFIXED))
return 0;
- if(dbei->cbBlob == 0 || dbei->pBlob == 0)
+ if (dbei->cbBlob == 0 || dbei->pBlob == 0)
return 0; // just to be safe
const char *proto = GetContactProto(hContact);
@@ -59,174 +59,98 @@ int OnDatabaseEventPreAdd(WPARAM hContact, LPARAM lParam)
return 0;
if (db_get_b(hContact, proto, "ChatRoom", 0) == 1)
return 0;
-
- if(mir_strcmp(proto, META_PROTO) == 0) {
+
+ if (mir_strcmp(proto, META_PROTO) == 0) {
hContact = db_mc_getMostOnline(hContact);
- if (!hContact) return 0;
+ if (!hContact)
+ return 0;
proto = GetContactProto(hContact);
- if (!proto ) return 0;
+ if (!proto)
+ return 0;
}
-
ConnContext *context = otrl_context_find_miranda(otr_user_state, hContact);
bool encrypted = otr_context_get_trust(context) != TRUST_NOT_PRIVATE;
- if (!encrypted) return 0;
+ if (!encrypted)
+ return 0;
DBEVENTINFO my_dbei = *dbei; // copy the other event
- char *msg = (char *)dbei->pBlob;
- char *newmsg = 0;
- DWORD alloclen = 0;
- DWORD msglen = (DWORD)mir_strlen(msg);
- if (dbei->flags & DBEF_UTF) {
- int prefixlen = (int)strnlen(options.prefix, 64);
- if (strncmp(msg, options.prefix, prefixlen) == 0) return 0;
- alloclen = (msglen+prefixlen+1)*sizeof(char);
-
- // get additional data
- DWORD len2 = alloclen- prefixlen*sizeof(char);
- int datalen = dbei->cbBlob - len2;
- if (datalen < 0) datalen = 0;
-
- newmsg = (char*)mir_alloc(alloclen);
- memset(newmsg, 0, alloclen+datalen);
- strncpy(newmsg, options.prefix, prefixlen);
- mir_strncat(newmsg, msg, alloclen - mir_strlen(newmsg));
- // append additional data
- if (datalen) {
- memcpy(newmsg+alloclen, msg+len2, datalen);
- alloclen += datalen;
- }
- } else {
- bool dz = false;
- if(msglen < dbei->cbBlob) {
- for(unsigned int i = msglen; i < dbei->cbBlob; i++) {
- if(msg[i] == 0 && msg[i - 1] == 0) {
- dz = true;
- break;
- }
- }
- }
- if(dz) {
- // yes, unicode
- wchar_t* msgw = (wchar_t *)&msg[msglen];
- wchar_t *prefixw = mir_utf8decodeW(options.prefix);
- int prefixlenw = (int)mir_wstrlen(prefixw);
- if (wcsncmp(msgw, prefixw, prefixlenw) == 0) {
- mir_free(prefixw);
- return 0;
- }
- int msglenw = (int)mir_wstrlen(msgw);
-
- char *prefix = mir_utf8decodeA(options.prefix);
- int prefixlen = (int)mir_strlen(prefix);
-
- alloclen = (msglen+prefixlen+1)* sizeof(char) + (msglenw + prefixlenw +1) * sizeof(wchar_t);
- // get additional data
- DWORD len2 = (msglen+1)* sizeof(char) + (msglenw+1) * sizeof(wchar_t);
- int datalen = dbei->cbBlob - len2;
- if (datalen < 0) datalen = 0;
-
- newmsg = (char*)mir_alloc(alloclen+datalen);
- memset(newmsg, 0, alloclen+datalen);
- strncpy(newmsg, prefix, prefixlen);
- mir_strncat(newmsg, msg, alloclen + datalen - mir_strlen(newmsg));
- wchar_t *p = (wchar_t*) newmsg + (msglen + prefixlen + 1);
- wcsncpy(p, prefixw, prefixlenw);
- mir_wstrncat(p, msgw, msglenw - mir_wstrlen(p));
- mir_free(prefix);
- mir_free(prefixw);
- // append additional data
- if (datalen) {
- memcpy(newmsg+alloclen, msg+len2, datalen);
- alloclen += datalen;
- }
- }
- else {
- char *prefix = mir_utf8decodeA(options.prefix);
- int prefixlen = (int)mir_strlen(prefix);
- if (strncmp(msg, prefix, prefixlen) == 0) {
- mir_free(prefix);
- return 0;
- }
- alloclen = msglen+prefixlen+sizeof(char);
- // get additional data
- DWORD len2 = alloclen-prefixlen;
- int datalen = dbei->cbBlob - len2;
- if (datalen < 0) datalen = 0;
-
- newmsg = (char*)mir_alloc(alloclen+datalen);
- memset(newmsg, 0, alloclen+datalen);
- strncpy(newmsg, prefix, prefixlen);
- mir_strncat(newmsg, msg, msglen - mir_strlen(newmsg));
- mir_free(prefix);
- // append additional data
- if (datalen) {
- memcpy(newmsg+alloclen, msg+len2, datalen);
- alloclen += datalen;
- }
- }
+ char *msg = (char*)dbei->pBlob;
+ int msgLen = (int)strlen(msg);
+
+ int prefixlen = (int)strnlen(options.prefix, 64);
+ if (strncmp(msg, options.prefix, prefixlen) == 0)
+ return 0;
+ // check for additional data presence
+ int datalen = dbei->cbBlob - msgLen;
+ if (datalen < 0)
+ datalen = 0;
+
+ CMStringA buf;
+ buf.Append(options.prefix, prefixlen);
+ buf.Append(msg);
+ // append additional data
+ if (datalen) {
+ buf.AppendChar(0);
+ buf.Append(msg + msgLen + 1, datalen);
}
- my_dbei.pBlob = (BYTE *)newmsg;
- my_dbei.cbBlob = alloclen;
+ my_dbei.pBlob = (BYTE*)buf.GetBuffer();
+ my_dbei.cbBlob = (int)buf.GetLength();
my_dbei.flags |= DBEF_OTR_PREFIXED;
-
db_event_add(hContact, &my_dbei);
- if (newmsg) mir_free(newmsg);
// stop original event from being added
return 1;
}
- int OnDatabaseEventAdded(WPARAM hContact, LPARAM lParam)
- {
- if (!options.delete_history) return 0;
+int OnDatabaseEventAdded(WPARAM hContact, LPARAM lParam)
+{
+ if (!options.delete_history)
+ return 0;
- static char* prefixutf = mir_utf8encodeT(TranslateT(LANG_INLINE_PREFIX));
- static char* prefix = Translate(LANG_INLINE_PREFIX);
- static DWORD lenutf = (DWORD)mir_strlen(prefixutf);
- static DWORD len = (DWORD)mir_strlen(prefix);
+ unsigned len = (unsigned)strlen(LANG_INLINE_PREFIX);
DBEVENTINFO info = { sizeof(info) };
- info.cbBlob = lenutf*2;
- info.pBlob = (PBYTE)mir_alloc(info.cbBlob);
- if (!db_event_get(lParam, &info)) {
- if(info.eventType == EVENTTYPE_MESSAGE) {
- MCONTACT hSub;
- if((hSub = db_mc_getMostOnline(hContact)) != 0)
- hContact = hSub;
-
- ConnContext *context = otrl_context_find_miranda(otr_user_state, hContact);
- if (context && otr_context_get_trust(context) != TRUST_NOT_PRIVATE ) {
- // only delete encrypted messages that are no OTR system messages
- if ( options.delete_systeminfo ||
- ((info.flags&DBEF_UTF && !(info.cbBlob >lenutf && 0==strncmp((char*)info.pBlob, prefixutf, lenutf)))
- || (!(info.flags&DBEF_UTF) && !(info.cbBlob >len && 0==strncmp((char*)info.pBlob, prefix, len)))))
- {
- DeleteEventNode *node = new DeleteEventNode();
- node->hContact = hContact;
- node->hDbEvent = lParam;
- node->timestamp = time(0);
- node->next = 0;
- mir_cslock lck(*lpRemoveChainCS);
- if (DeleteEvents.last)
- DeleteEvents.last->next = node;
- else
- DeleteEvents.first = node;
- DeleteEvents.last = node;
- }
- }
+ info.cbBlob = len * 2;
+ info.pBlob = (PBYTE)_alloca(info.cbBlob);
+ if (db_event_get(lParam, &info))
+ return 0;
+
+ if (info.eventType != EVENTTYPE_MESSAGE)
+ return 0;
+
+ MCONTACT hSub;
+ if ((hSub = db_mc_getMostOnline(hContact)) != 0)
+ hContact = hSub;
+
+ ConnContext *context = otrl_context_find_miranda(otr_user_state, hContact);
+ if (context && otr_context_get_trust(context) != TRUST_NOT_PRIVATE) {
+ // only delete encrypted messages that are no OTR system messages
+ if (options.delete_systeminfo || !(info.cbBlob > len && !strncmp((char*)info.pBlob, LANG_INLINE_PREFIX, len))) {
+ DeleteEventNode *node = new DeleteEventNode();
+ node->hContact = hContact;
+ node->hDbEvent = lParam;
+ node->timestamp = time(0);
+ node->next = 0;
+ mir_cslock lck(RemoveChainCS);
+ if (DeleteEvents.last)
+ DeleteEvents.last->next = node;
+ else
+ DeleteEvents.first = node;
+ DeleteEvents.last = node;
}
}
- mir_free(prefixutf);
- mir_free(info.pBlob);
return 0;
}
-void FinishSession(MCONTACT hContact) {
- if (!hContact) return;
+void FinishSession(MCONTACT hContact)
+{
+ if (!hContact)
+ return;
+
ConnContext *context = otrl_context_find_miranda(otr_user_state, hContact);
TrustLevel level = otr_context_get_trust(context);
if (level == TRUST_UNVERIFIED || level == TRUST_PRIVATE) {
@@ -239,18 +163,19 @@ void FinishSession(MCONTACT hContact) {
return;
}
-int WindowEvent(WPARAM wParam, LPARAM lParam) {
+int WindowEvent(WPARAM wParam, LPARAM lParam)
+{
MessageWindowEventData *mwd = (MessageWindowEventData *)lParam;
-
- if(mwd->uType == MSG_WINDOW_EVT_CLOSE && options.end_window_close) {
+ if (mwd->uType == MSG_WINDOW_EVT_CLOSE && options.end_window_close) {
FinishSession(mwd->hContact);
return 0;
}
- if(mwd->uType != MSG_WINDOW_EVT_OPEN) return 0;
+ if (mwd->uType != MSG_WINDOW_EVT_OPEN)
+ return 0;
MCONTACT hContact = mwd->hContact, hTemp;
- if((hTemp = db_mc_getMostOnline(hContact)) != 0)
+ if ((hTemp = db_mc_getMostOnline(hContact)) != 0)
hContact = hTemp;
if (!CallService(MS_PROTO_ISPROTOONCONTACT, hContact, (LPARAM)MODULENAME))
@@ -258,38 +183,36 @@ int WindowEvent(WPARAM wParam, LPARAM lParam) {
lib_cs_lock();
ConnContext *context = otrl_context_find_miranda(otr_user_state, hContact);
-
SetEncryptionStatus(hContact, otr_context_get_trust(context));
-
return 0;
}
// if it's a protocol going offline, attempt to send terminate session to all contacts of that protocol
// (this would be hooked as the ME_CLIST_STATUSMODECHANGE handler except that event is sent *after* the proto goes offline)
-int StatusModeChange(WPARAM wParam, LPARAM lParam) {
+int StatusModeChange(WPARAM wParam, LPARAM lParam)
+{
int status = (int)wParam;
+ if (status != ID_STATUS_OFFLINE)
+ return 0;
- if(status != ID_STATUS_OFFLINE ) return 0;
-
const char *proto = (char *)lParam;
- MCONTACT hContact;
lib_cs_lock();
-
- ConnContext *context = otr_user_state->context_root;
- while(context) {
- if(context->msgstate == OTRL_MSGSTATE_ENCRYPTED && (proto == 0 || mir_strcmp(proto, context->protocol) == 0)) {
- hContact = (MCONTACT)context->app_data;
-
- if(hContact) {
- otrl_message_disconnect(otr_user_state, &ops, (void*)hContact, context->accountname, context->protocol, context->username, OTRL_INSTAG_BEST);
- SetEncryptionStatus(hContact, TRUST_NOT_PRIVATE);
- }
-
+
+ ConnContext *context = otr_user_state->context_root;
+ while (context) {
+ if (context->msgstate == OTRL_MSGSTATE_ENCRYPTED && (proto == 0 || mir_strcmp(proto, context->protocol) == 0)) {
+ MCONTACT hContact = (MCONTACT)context->app_data;
+
+ if (hContact) {
+ otrl_message_disconnect(otr_user_state, &ops, (void*)hContact, context->accountname, context->protocol, context->username, OTRL_INSTAG_BEST);
+ SetEncryptionStatus(hContact, TRUST_NOT_PRIVATE);
}
- context = context->next;
+
}
-
+ context = context->next;
+ }
+
return 0;
}
@@ -297,49 +220,54 @@ int OnContactSettingChanged(WPARAM hContact, LPARAM lParam)
{
if (!options.end_offline)
return 0;
+
DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING *)lParam;
if (!lParam || mir_strcmp(cws->szSetting, "Status") != 0) return 0;
- int status=0;
- switch (cws->value.type){
- case DBVT_WORD:
- status = cws->value.wVal;
- break;
- case DBVT_BYTE:
- status = cws->value.bVal;
- break;
- case DBVT_DWORD:
- status = cws->value.dVal;
- break;
+ int status = 0;
+ switch (cws->value.type) {
+ case DBVT_WORD:
+ status = cws->value.wVal;
+ break;
+ case DBVT_BYTE:
+ status = cws->value.bVal;
+ break;
+ case DBVT_DWORD:
+ status = cws->value.dVal;
+ break;
}
+
if (status == ID_STATUS_OFFLINE) {
if (!hContact) {
// Protocol is going offline
// Terminate sessions with all contacts of that proto
- StatusModeChange((WPARAM) ID_STATUS_OFFLINE, (LPARAM)cws->szModule);
+ StatusModeChange((WPARAM)ID_STATUS_OFFLINE, (LPARAM)cws->szModule);
return 0;
- }else if(CallService(MS_PROTO_ISPROTOONCONTACT, hContact, (LPARAM)MODULENAME)) {
+ }
+ if (CallService(MS_PROTO_ISPROTOONCONTACT, hContact, (LPARAM)MODULENAME)) {
// only care about contacts to which this filter is attached
FinishSession(hContact);
}
}
-
return 0;
}
-void InitDBFilter() {
+void InitDBFilter()
+{
hDBEventPreAdd = HookEvent(ME_DB_EVENT_FILTER_ADD, OnDatabaseEventPreAdd);
hDBEventAdded = HookEvent(ME_DB_EVENT_ADDED, OnDatabaseEventAdded);
hContactSettingChanged = HookEvent(ME_DB_CONTACT_SETTINGCHANGED, OnContactSettingChanged);
timerId = SetTimer(0, 0, 1000, DeleteTimerProc);
}
-void DeinitDBFilter() {
+
+void DeinitDBFilter()
+{
UnhookEvent(hDBEventPreAdd);
hDBEventPreAdd = 0;
UnhookEvent(hDBEventAdded);
hDBEventAdded = 0;
UnhookEvent(hContactSettingChanged);
- hContactSettingChanged=0;
+ hContactSettingChanged = 0;
if (timerId) KillTimer(0, timerId);
- DeleteTimerProc(0,0,0,0);
+ DeleteTimerProc(0, 0, 0, 0);
}
diff --git a/plugins/MirOTR/src/language.h b/plugins/MirOTR/src/language.h
index 64c4373251..ab93acfa5a 100644
--- a/plugins/MirOTR/src/language.h
+++ b/plugins/MirOTR/src/language.h
@@ -1,5 +1,7 @@
#pragma once
+#define LANG_INLINE_PREFIX "[OTR INFO] "
+
#define LANG_START_OTR LPGEN("Start OTR")
#define LANG_STOP_OTR LPGEN("Stop OTR")
@@ -33,7 +35,6 @@
#define LANG_ENCRYPTION_ERROR LPGEN("OTR could not encrypt when sending message")
#define LANG_OTR_INFO LPGEN("OTR Information")
-#define LANG_INLINE_PREFIX LPGEN("[OTR INFO] ")
#define LANG_FINGERPRINT_VERIFIED LPGEN("OTR encrypted session with '%s' is now using a VERIFIED fingerprint")
#define LANG_FINGERPRINT_NOT_VERIFIED LPGEN("OTR encrypted session with '%s' is now using a NOT VERIFIED fingerprint")
diff --git a/plugins/MirOTR/src/utils.cpp b/plugins/MirOTR/src/utils.cpp
index 5e9715e256..b4615bc689 100644
--- a/plugins/MirOTR/src/utils.cpp
+++ b/plugins/MirOTR/src/utils.cpp
@@ -315,7 +315,7 @@ void ShowErrorUtf(char* msg) {
void ShowMessageInline(const MCONTACT hContact, const TCHAR *msg) {
TCHAR buff[1024];
- mir_sntprintf(buff, SIZEOF(buff), _T("%s%s"), TranslateT(LANG_INLINE_PREFIX), msg);
+ mir_sntprintf(buff, SIZEOF(buff), _T("%s%s"), _T(LANG_INLINE_PREFIX), msg);
T2Utf utf(buff);
PROTORECVEVENT pre = {0};
@@ -327,7 +327,7 @@ void ShowMessageInline(const MCONTACT hContact, const TCHAR *msg) {
void ShowMessageInlineUtf(const MCONTACT hContact, const char *msg) {
char buff[1024];
- mir_snprintf(buff, SIZEOF(buff), "%s%s", Translate(LANG_INLINE_PREFIX), msg);
+ mir_snprintf(buff, SIZEOF(buff), "%s%s", LANG_INLINE_PREFIX, msg);
PROTORECVEVENT pre = {0};
pre.timestamp = time(0);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 07:49:20 +0000