diff options
| author | Stefan Hacker <dd0t@users.sourceforge.net> | 2012-09-14 20:20:47 +0400 |
|---|---|---|
| committer | Stefan Hacker <dd0t@users.sourceforge.net> | 2012-09-18 19:50:07 +0400 |
| commit | 145d9f96f5232a156318563a8659a2db182277a1 (patch) | |
| tree | 50485a69f102feb8bc396fcd2dffb18a696598ab /src/murmur/Server.h | |
| parent | 98cacbc28fa98e36eb6eba60b3cf40c36d76a05c (diff) | |
Introduce channel nesting limit (default=10).
Add NestingLimitException to Ice Interface and introduce a new NestingLimit PermissionDenied type.
Addresses #3566322 "ServerDB::deleteServer crashes master"
Diffstat (limited to 'src/murmur/Server.h')
| -rw-r--r-- | src/murmur/Server.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/murmur/Server.h b/src/murmur/Server.h index 8d0c2a919..03373be79 100644 --- a/src/murmur/Server.h +++ b/src/murmur/Server.h @@ -176,6 +176,10 @@ class Server : public QThread { // Registration, implementation in Register.cpp QTimer qtTick; void initRegister(); + + private: + int iChannelNestingLimit; + public slots: void regSslError(const QList<QSslError> &); void finished(); @@ -276,6 +280,8 @@ class Server : public QThread { Server(int snum, QObject *parent = NULL); ~Server(); + bool canNest(Channel *newParent, Channel *channel = NULL) const; + // RPC functions. Implementation in RPC.cpp void connectAuthenticator(QObject *p); void disconnectAuthenticator(QObject *p); |