This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gokdrive. from 7f04a16 d/changelog: update from git history new e54b54f (re)enable sessions debugging. new e4df420 fix infinite loop if reading of cookie has failed. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ x2gokdrive.c | 7 ++++++- x2gokdrivedebug.h | 51 --------------------------------------------------- x2gokdriveinit.c | 7 ++++++- x2gokdrivelog.h | 15 +++++++++++++++ x2gokdriveremote.c | 10 ++++++++-- x2gokdriveremote.h | 1 - x2gokdriveselection.c | 8 +++++++- 8 files changed, 44 insertions(+), 57 deletions(-) delete mode 100644 x2gokdrivedebug.h -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit e54b54fafa5e5174a03e13e2d2ace31a3558e1bf Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Tue Jun 22 09:18:47 2021 -0500 (re)enable sessions debugging. --- debian/changelog | 1 + x2gokdrive.c | 7 ++++++- x2gokdrivedebug.h | 51 --------------------------------------------------- x2gokdriveinit.c | 7 ++++++- x2gokdrivelog.h | 15 +++++++++++++++ x2gokdriveremote.c | 8 +++++++- x2gokdriveremote.h | 1 - x2gokdriveselection.c | 8 +++++++- 8 files changed, 42 insertions(+), 56 deletions(-) diff --git a/debian/changelog b/debian/changelog index 984a132..03dfbc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium - add name of the thread to the debug output. - move calling of possibly thread-unsafe ospoll functions (SetNotifyFd, RemoveNotifyFd) to main thread. + - (re)enable sessions debugging. [ Mihai Moldovan ] * Initial release: diff --git a/x2gokdrive.c b/x2gokdrive.c index a98afd8..c81d126 100644 --- a/x2gokdrive.c +++ b/x2gokdrive.c @@ -43,11 +43,16 @@ #include "inputstr.h" #include "scrnintstr.h" -#include "x2gokdrivedebug.h" #include "x2gokdrivelog.h" #include "xkbsrv.h" +#ifdef EPHYR_WANT_DEBUG +unsigned long long int debug_sendThreadId; +unsigned long long int debug_selectThreadId; +#endif /* EPHYR_WANT_DEBUG */ + + KdKeyboardInfo *ephyrKbd; KdPointerInfo *ephyrMouse; Bool ephyrNoDRI = FALSE; diff --git a/x2gokdrivedebug.h b/x2gokdrivedebug.h deleted file mode 100644 index 86368ef..0000000 --- a/x2gokdrivedebug.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * X2GoKDrive - A kdrive X server for X2Go (based on Xephyr) - * Author Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> - * - * Copyright © 2018 phoca-GmbH - * - * - * - * Xephyr - A kdrive X server thats runs in a host X window. - * Authored by Matthew Allum <mallum@o-hand.com> - * - * Copyright © 2004 Nokia - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ - -#ifndef X2GOKDRIVEDEBUG_H -#define X2GOKDRIVEDEBUG_H - -// # warning DEBUG ENABLED -// #define EPHYR_WANT_DEBUG - -#ifdef EPHYR_WANT_DEBUG -#define EPHYR_DBG(x, a...) \ -if(pthread_self()==debug_sendThreadId)\ -fprintf(stderr,"SEND:"__FILE__ ":%d,%s() " x "\n", __LINE__, __func__, ##a);\ -else if (pthread_self()==debug_selectThreadId)\ -fprintf(stderr,"SEL:"__FILE__ ":%d,%s() " x "\n", __LINE__, __func__, ##a);\ -else \ -fprintf(stderr,"MAIN:"__FILE__ ":%d,%s() " x "\n", __LINE__, __func__, ##a) -#else -#define EPHYR_DBG(x, a...) do {} while (0) -#endif - -#ifdef EPHYR_WANT_DEBUG -unsigned long long int debug_sendThreadId; -unsigned long long int debug_selectThreadId; -#endif /* EPHYR_WANT_DEBUG */ - -#endif /* X2GOKDRIVE_H */ diff --git a/x2gokdriveinit.c b/x2gokdriveinit.c index ac07132..343c1f5 100644 --- a/x2gokdriveinit.c +++ b/x2gokdriveinit.c @@ -38,7 +38,12 @@ #include "x2gokdrivelog.h" #include "glx_extinit.h" #include "x2gokdriveremote.h" -#include "x2gokdrivedebug.h" + +#ifdef EPHYR_WANT_DEBUG +extern unsigned long long int debug_sendThreadId; +extern unsigned long long int debug_selectThreadId; +#endif /* EPHYR_WANT_DEBUG */ + extern Window EphyrPreExistingHostWin; extern Bool EphyrWantGrayScale; diff --git a/x2gokdrivelog.h b/x2gokdrivelog.h index ead72bc..43aa95d 100644 --- a/x2gokdrivelog.h +++ b/x2gokdrivelog.h @@ -65,4 +65,19 @@ if (!(cond)) {EPHYR_LOG_ERROR("condition %s failed\n", #cond);return;} if (!(cond)) {EPHYR_LOG_ERROR("condition %s failed\n", #cond);return val;} #endif /*nomadik_return_val_if_fail */ +// # warning DEBUG ENABLED +#define EPHYR_WANT_DEBUG + +#ifdef EPHYR_WANT_DEBUG +#define EPHYR_DBG(x, a...) \ +if(pthread_self()==debug_sendThreadId)\ +fprintf(stderr,"SEND:"__FILE__ ":%d,%s() " x "\n", __LINE__, __func__, ##a);\ +else if (pthread_self()==debug_selectThreadId)\ +fprintf(stderr,"SEL:"__FILE__ ":%d,%s() " x "\n", __LINE__, __func__, ##a);\ +else \ +fprintf(stderr,"MAIN:"__FILE__ ":%d,%s() " x "\n", __LINE__, __func__, ##a) +#else +#define EPHYR_DBG(x, a...) do {} while (0) +#endif + #endif /* X2GOKDRIVELOG_H */ diff --git a/x2gokdriveremote.c b/x2gokdriveremote.c index fb5165e..45c8cf0 100644 --- a/x2gokdriveremote.c +++ b/x2gokdriveremote.c @@ -35,10 +35,16 @@ #endif #include "x2gokdriveremote.h" -#include "x2gokdrivedebug.h" #include "x2gokdriveselection.h" +#include "x2gokdrivelog.h" #include <zlib.h> +#ifdef EPHYR_WANT_DEBUG +extern unsigned long long int debug_sendThreadId; +extern unsigned long long int debug_selectThreadId; +#endif /* EPHYR_WANT_DEBUG */ + + /* init it in OsInit() */ static struct _remoteHostVars remoteVars = {0}; struct _remoteHostVars RemoteHostVars; diff --git a/x2gokdriveremote.h b/x2gokdriveremote.h index b658e1b..ce48005 100644 --- a/x2gokdriveremote.h +++ b/x2gokdriveremote.h @@ -70,7 +70,6 @@ #include <xcb/xcb_keysyms.h> #include <xcb/randr.h> #include <xcb/xkb.h> -#include "x2gokdrivelog.h" #include <jpeglib.h> diff --git a/x2gokdriveselection.c b/x2gokdriveselection.c index 89aa3ed..4f29a6d 100644 --- a/x2gokdriveselection.c +++ b/x2gokdriveselection.c @@ -45,7 +45,13 @@ #endif #include "x2gokdriveselection.h" -#include "x2gokdrivedebug.h" +#include "x2gokdrivelog.h" + +#ifdef EPHYR_WANT_DEBUG +extern unsigned long long int debug_sendThreadId; +extern unsigned long long int debug_selectThreadId; +#endif /* EPHYR_WANT_DEBUG */ + #define SELECTION_DELAY 30000 //timeout for selection operation #define INCR_SIZE 256*1024 //size of part for incr selection incr selection -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit e4df4207872952c180f828ff34fc71f4fceaeff5 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Tue Jun 22 09:21:10 2021 -0500 fix infinite loop if reading of cookie has failed. --- debian/changelog | 1 + x2gokdriveremote.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 03dfbc9..7b23b31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium - move calling of possibly thread-unsafe ospoll functions (SetNotifyFd, RemoveNotifyFd) to main thread. - (re)enable sessions debugging. + - fix infinite loop if reading of cookie has failed. [ Mihai Moldovan ] * Initial release: diff --git a/x2gokdriveremote.c b/x2gokdriveremote.c index 45c8cf0..f98c28e 100644 --- a/x2gokdriveremote.c +++ b/x2gokdriveremote.c @@ -2496,7 +2496,7 @@ void serverAcceptNotify(int fd, int ready_sock, void *data) EPHYR_DBG("READ COOKIE ERROR"); shutdown(remoteVars.clientsock, SHUT_RDWR); close(remoteVars.clientsock); - continue; + return; } ready+=chunk; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
-
git-admin＠x2go.org