Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-17 20:04:22 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

updated v0.6-Circles with latest trunk

Browse Source
This commit is contained in:
csoler 2016-01-01 22:18:43 -05:00
commit 8ec0e10019
10 changed files with 142 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
build_scripts/Debian+Ubuntu/convert_dos_files_to_unix.sh Executable file
View File

@ -0,0 +1,32 @@
#!/bin/sh
# This script search for files with [dos] line endings down the current directory and converts them to unix format
if test "$*" = ""; then
echo No files supplied. Searching for files down the current directory...
files=""
files=$files" "`find . -name "*.cpp" | xargs file /tmp | grep CRLF | cut -d: -f1`
files=$files" "`find . -name "*.h" | xargs file /tmp | grep CRLF | cut -d: -f1`
files=$files" "`find . -name "*.ui" | xargs file /tmp | grep CRLF | cut -d: -f1`
files=$files" "`find . -name "*.pro" | xargs file /tmp | grep CRLF | cut -d: -f1`
else
files="$*"
fi
echo About to convert the following files to unix format:
for i in $files; do
echo " "$i
done
echo Please press [ENTER] when ready
read tmp
for i in $files; do
echo " "converting $i...
cat $i | sed -e s/ //g > $i.tmp0000
mv -f $i.tmp0000 $i
done
echo Done.

4
libbitdht/src/udp/udplayer.cc
View File

@ -262,6 +262,7 @@ void UdpLayer::recv_loop()
#ifdef DEBUG_UDP_LAYER
std::cerr << "UdpLayer::recv_loop() stopping thread" << std::endl;
#endif
free(inbuf) ;
stop();
}
@ -301,9 +302,6 @@ void UdpLayer::recv_loop()
#endif
}
}
free(inbuf) ;
return;
}

4
libretroshare/src/gxs/rsgxsnetservice.cc
View File

@ -1,4 +1,3 @@
/*
* libretroshare/src/gxs: rsgxnetservice.cc
*
@ -2751,6 +2750,8 @@ void RsGxsNetService::locked_stampPeerGroupUpdateTime(const RsPeerId& pid,const
{
pitem = new RsGxsMsgUpdateItem(mServType) ;
pitem->peerId = pid ;
mClientMsgUpdateMap[pid] = pitem ;
}
else
pitem = it->second ;
@ -4354,3 +4355,4 @@ void RsGxsNetService::handleRecvPublishKeys(RsNxsGroupPublishKeyItem *item)
}
}

3
libretroshare/src/gxstunnel/p3gxstunnel.cc
View File

@ -295,7 +295,7 @@ void p3GxsTunnelService::handleRecvTunnelDataAckItem(const RsGxsTunnelId& id,RsG
if(it == pendingGxsTunnelDataItems.end())
{
std::cerr << " (EE) item number " << std::hex << item->unique_item_counter << " is unknown. This is unexpected." << std::endl;
std::cerr << " (EE) item number " << std::hex << item->unique_item_counter << std::dec << " is unknown. This is unexpected." << std::endl;
return ;
}
@ -1213,7 +1213,6 @@ bool p3GxsTunnelService::locked_sendEncryptedTunnelData(RsGxsTunnelItem *item)
if(!RsAES::aes_crypt_8_16(buff,rssize,aes_key,(uint8_t*)&IV,encrypted_data,encrypted_size))
{
std::cerr << "(EE) packet encryption failed." << std::endl;
delete[] encrypted_data ;
return false;
}

1
libretroshare/src/rsserver/p3face-server.cc
View File

@ -93,6 +93,7 @@ RsServer::RsServer()
msgSrv = NULL;
chatSrv = NULL;
mStatusSrv = NULL;
mGxsTunnels = NULL;
mMin = 0;
mLoop = 0;

3
libretroshare/src/rsserver/rsinit.cc
View File

@ -1372,12 +1372,11 @@ int RsServer::StartupRetroShare()
/**** Wiki GXS service ****/
#ifdef RS_USE_WIKI
RsGeneralDataService* wiki_ds = new RsDataService(currGxsDir + "/", "wiki_db",
RS_SERVICE_GXS_TYPE_WIKI,
NULL, rsInitConfig->gxs_passwd);
#ifdef RS_USE_WIKI
p3Wiki *mWiki = new p3Wiki(wiki_ds, NULL, mGxsIdService);
// create GXS wiki service
RsGxsNetService* wiki_ns = new RsGxsNetService(

163
libretroshare/src/util/stacktrace.h
View File

@ -1,10 +1,32 @@
// stacktrace.h (c) 2008, Timo Bingmann from http://idlebox.net/
// published under the WTFPL v2.0
/*
* stacktrace.h
*
* Copyright (C) 2016 Gioacchino Mazzurco <gio@eigenlab.org>
* Copyright (C) 2008 Timo Bingmann http://idlebox.net/
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License Version 2 as published by the Free Software Foundation.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA.
*
*/
#ifndef _STACKTRACE_H_
#define _STACKTRACE_H_
#include <stdio.h>
#ifndef WINDOWS_SYS
#include <stdlib.h>
#include <execinfo.h>
#include <cxxabi.h>
@ -12,82 +34,89 @@
/** Print a demangled stack backtrace of the caller function to FILE* out. */
static inline void print_stacktrace(FILE *out = stderr, unsigned int max_frames = 63)
{
fprintf(out, "stack trace:\n");
fprintf(out, "stack trace:\n");
// storage array for stack trace address data
void* addrlist[max_frames+1];
// storage array for stack trace address data
void* addrlist[max_frames+1];
// retrieve current stack addresses
int addrlen = backtrace(addrlist, sizeof(addrlist) / sizeof(void*));
// retrieve current stack addresses
int addrlen = backtrace(addrlist, sizeof(addrlist) / sizeof(void*));
if (addrlen == 0) {
fprintf(out, " <empty, possibly corrupt>\n");
return;
}
// resolve addresses into strings containing "filename(function+address)",
// this array must be free()-ed
char** symbollist = backtrace_symbols(addrlist, addrlen);
// allocate string which will be filled with the demangled function name
size_t funcnamesize = 256;
char* funcname = (char*)malloc(funcnamesize);
// iterate over the returned symbol lines. skip the first, it is the
// address of this function.
for (int i = 1; i < addrlen; i++)
{
char *begin_name = 0, *begin_offset = 0, *end_offset = 0;
// find parentheses and +address offset surrounding the mangled name:
// ./module(function+0x15c) [0x8048a6d]
for (char *p = symbollist[i]; *p; ++p)
if (addrlen == 0)
{
if (*p == '(')
begin_name = p;
else if (*p == '+')
begin_offset = p;
else if (*p == ')' && begin_offset) {
end_offset = p;
break;
}
fprintf(out, " <empty, possibly corrupt>\n");
return;
}
if (begin_name && begin_offset && end_offset
&& begin_name < begin_offset)
// resolve addresses into strings containing "filename(function+address)",
// this array must be free()-ed
char** symbollist = backtrace_symbols(addrlist, addrlen);
// allocate string which will be filled with the demangled function name
size_t funcnamesize = 256;
char* funcname = (char*)malloc(funcnamesize);
// iterate over the returned symbol lines. skip the first, it is the
// address of this function.
for (int i = 1; i < addrlen; i++)
{
*begin_name++ = '\0';
*begin_offset++ = '\0';
*end_offset = '\0';
char *begin_name = 0, *begin_offset = 0, *end_offset = 0;
// mangled name is now in [begin_name, begin_offset) and caller
// offset in [begin_offset, end_offset). now apply
// __cxa_demangle():
// find parentheses and +address offset surrounding the mangled name:
// ./module(function+0x15c) [0x8048a6d]
for (char *p = symbollist[i]; *p; ++p)
{
if (*p == '(') begin_name = p;
else if (*p == '+') begin_offset = p;
else if (*p == ')' && begin_offset)
{
end_offset = p;
break;
}
}
int status;
char* ret = abi::__cxa_demangle(begin_name,
funcname, &funcnamesize, &status);
if (status == 0) {
funcname = ret; // use possibly realloc()-ed string
fprintf(out, " %s : %s+%s\n",
symbollist[i], funcname, begin_offset);
}
else {
// demangling failed. Output function name as a C function with
// no arguments.
fprintf(out, " %s : %s()+%s\n",
symbollist[i], begin_name, begin_offset);
}
if (begin_name && begin_offset && end_offset && begin_name < begin_offset)
{
*begin_name++ = '\0';
*begin_offset++ = '\0';
*end_offset = '\0';
// mangled name is now in [begin_name, begin_offset) and caller
// offset in [begin_offset, end_offset). now apply
// __cxa_demangle():
int status;
char* ret = abi::__cxa_demangle(begin_name, funcname, &funcnamesize, &status);
if (status == 0)
{
funcname = ret; // use possibly realloc()-ed string
fprintf(out, " %s : %s+%s\n", symbollist[i], funcname, begin_offset);
}
else
{
// demangling failed. Output function name as a C function with
// no arguments.
fprintf(out, " %s : %s()+%s\n", symbollist[i], begin_name, begin_offset);
}
}
else
{
// couldn't parse the line? print the whole line.
fprintf(out, " %s\n", symbollist[i]);
}
}
else
{
// couldn't parse the line? print the whole line.
fprintf(out, " %s\n", symbollist[i]);
}
}
free(funcname);
free(symbollist);
free(funcname);
free(symbollist);
}
#else // WINDOWS_SYS
static inline void print_stacktrace(FILE *out = stderr, unsigned int max_frames = 63)
{
(void) max_frames;
fprintf(out, "TODO: 2016/01/01 print_stacktrace not implemented yet for WINDOWS_SYS\n");
}
#endif // WINDOWS_SYS
#endif // _STACKTRACE_H_

3
retroshare-gui/src/gui/Identity/IdDialog.h
View File

@ -61,6 +61,7 @@ protected:
private slots:
void createExternalCircle();
void editExistingCircle();
void filterComboBoxChanged();
void filterChanged(const QString &text);
@ -77,6 +78,7 @@ private slots:
/** Create the context popup menu and it's submenus */
void IdListCustomPopupMenu( QPoint point );
void CircleListCustomPopupMenu(QPoint point) ;
void circle_selected() ;
@ -110,6 +112,7 @@ private:
private:
TokenQueue *mIdQueue;
TokenQueue *mCircleQueue;
UIStateHelper *mStateHelper;
QTreeWidgetItem *contactsItem;

2
retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
View File

@ -100,6 +100,7 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget
mTokenTypeMessageData = nextTokenType();
mTokenTypeReplyMessage = nextTokenType();
mTokenTypeReplyForumMessage = nextTokenType();
mTokenTypeBanAuthor = nextTokenType();
setUpdateWhenInvisible(true);
@ -127,6 +128,7 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget
//mStateHelper->addLoadPlaceholder(mTokenTypeMessageData, ui->threadTitle);
mSubscribeFlags = 0;
mSignFlags = 0;
mInProcessSettings = false;
mUnreadCount = 0;
mNewCount = 0;

4
retroshare-gui/src/util/HandleRichText.cpp
View File

@ -587,9 +587,9 @@ static void optimizeHtml(QDomDocument& doc
if (pair.length()!=2) return; //Malformed style list so a bad message or last item.
QString keyvalue = pair.at(1);
keyvalue.replace(";","");
QStringList* classUsingIt = new QStringList(pair.at(0).split(','));
QStringList classUsingIt(pair.at(0).split(','));
QStringList* exported = new QStringList();
foreach (QString keyVal, *classUsingIt) {
foreach (QString keyVal, classUsingIt) {
if(!keyVal.trimmed().isEmpty()) {
exported->append(keyVal.trimmed().replace(".",""));
}