murmur-rpc 0.0.3 → 0.0.4
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/murmur-rpc.rb +1 -1
- data/vendor/ice/Murmur.ice +138 -118
- data/vendor/ice/Murmur.rb +98 -103
- metadata +3 -3
data/lib/murmur-rpc.rb
CHANGED
data/vendor/ice/Murmur.ice
CHANGED
@@ -1,11 +1,13 @@
|
|
1
1
|
/**
|
2
2
|
*
|
3
3
|
* Information and control of the murmur server. Each server has
|
4
|
-
* one
|
5
|
-
* each virtual server has a
|
4
|
+
* one {@link Meta} interface that controls global information, and
|
5
|
+
* each virtual server has a {@link Server} interface.
|
6
6
|
*
|
7
7
|
**/
|
8
8
|
|
9
|
+
#include <Ice/SliceChecksumDict.ice>
|
10
|
+
|
9
11
|
module Murmur
|
10
12
|
{
|
11
13
|
|
@@ -26,11 +28,15 @@ module Murmur
|
|
26
28
|
bool deaf;
|
27
29
|
/** Is the user suppressed by the server? This means the user is not muted, but does not have speech privileges in the current channel. */
|
28
30
|
bool suppress;
|
31
|
+
/** Is the user a priority speaker? */
|
32
|
+
bool prioritySpeaker;
|
29
33
|
/** Is the user self-muted? */
|
30
34
|
bool selfMute;
|
31
35
|
/** Is the user self-deafened? If true, this implies mute. */
|
32
36
|
bool selfDeaf;
|
33
|
-
/**
|
37
|
+
/** Is the User recording? (This flag is read-only and cannot be changed using setState().) **/
|
38
|
+
bool recording;
|
39
|
+
/** Channel ID the user is in. Matches {@link Channel.id}. */
|
34
40
|
int channel;
|
35
41
|
/** The name of the user. */
|
36
42
|
string name;
|
@@ -183,7 +189,7 @@ module Murmur
|
|
183
189
|
sequence<Tree> TreeList;
|
184
190
|
|
185
191
|
enum ChannelInfo { ChannelDescription, ChannelPosition };
|
186
|
-
enum UserInfo { UserName, UserEmail, UserComment, UserHash, UserPassword };
|
192
|
+
enum UserInfo { UserName, UserEmail, UserComment, UserHash, UserPassword, UserLastActive };
|
187
193
|
|
188
194
|
dictionary<int, User> UserMap;
|
189
195
|
dictionary<int, Channel> ChannelMap;
|
@@ -221,7 +227,7 @@ module Murmur
|
|
221
227
|
};
|
222
228
|
|
223
229
|
exception MurmurException {};
|
224
|
-
/** This is thrown when you specify an invalid session. This may happen if the user has disconnected since your last call to
|
230
|
+
/** This is thrown when you specify an invalid session. This may happen if the user has disconnected since your last call to {@link Server.getUsers}. See {@link User.session} */
|
225
231
|
exception InvalidSessionException extends MurmurException {};
|
226
232
|
/** This is thrown when you specify an invalid channel id. This may happen if the channel was removed by another provess. It can also be thrown if you try to add an invalid channel. */
|
227
233
|
exception InvalidChannelException extends MurmurException {};
|
@@ -229,7 +235,7 @@ module Murmur
|
|
229
235
|
exception InvalidServerException extends MurmurException {};
|
230
236
|
/** This happens if you try to fetch user or channel state on a stopped server, if you try to stop an already stopped server or start an already started server. */
|
231
237
|
exception ServerBootedException extends MurmurException {};
|
232
|
-
/** This is thrown if
|
238
|
+
/** This is thrown if {@link Server.start} fails, and should generally be the cause for some concern. */
|
233
239
|
exception ServerFailureException extends MurmurException {};
|
234
240
|
/** This is thrown when you specify an invalid userid. */
|
235
241
|
exception InvalidUserException extends MurmurException {};
|
@@ -246,35 +252,35 @@ module Murmur
|
|
246
252
|
* Please note that all callbacks are done asynchronously; murmur does not wait for the callback to
|
247
253
|
* complete before continuing processing.
|
248
254
|
* Note that callbacks are removed when a server is stopped, so you should have a callback for
|
249
|
-
*
|
255
|
+
* {@link MetaCallback.started} which calls {@link Server.addCallback}.
|
250
256
|
* @see MetaCallback
|
251
|
-
* @see Server
|
257
|
+
* @see Server.addCallback
|
252
258
|
*/
|
253
259
|
interface ServerCallback {
|
254
260
|
/** Called when a user connects to the server.
|
255
261
|
* @param state State of connected user.
|
256
|
-
*/
|
262
|
+
*/
|
257
263
|
idempotent void userConnected(User state);
|
258
|
-
/** Called when a user disconnects from the server. The user has already been removed, so you can no longer use methods like
|
264
|
+
/** Called when a user disconnects from the server. The user has already been removed, so you can no longer use methods like {@link Server.getState}
|
259
265
|
* to retrieve the user's state.
|
260
266
|
* @param state State of disconnected user.
|
261
|
-
*/
|
267
|
+
*/
|
262
268
|
idempotent void userDisconnected(User state);
|
263
269
|
/** Called when a user state changes. This is called if the user moves, is renamed, is muted, deafened etc.
|
264
270
|
* @param state New state of user.
|
265
|
-
*/
|
271
|
+
*/
|
266
272
|
idempotent void userStateChanged(User state);
|
267
273
|
/** Called when a new channel is created.
|
268
274
|
* @param state State of new channel.
|
269
|
-
*/
|
275
|
+
*/
|
270
276
|
idempotent void channelCreated(Channel state);
|
271
|
-
/** Called when a channel is removed. The channel has already been removed, you can no longer use methods like
|
277
|
+
/** Called when a channel is removed. The channel has already been removed, you can no longer use methods like {@link Server.getChannelState}
|
272
278
|
* @param state State of removed channel.
|
273
|
-
*/
|
279
|
+
*/
|
274
280
|
idempotent void channelRemoved(Channel state);
|
275
281
|
/** Called when a new channel state changes. This is called if the channel is moved, renamed or if new links are added.
|
276
282
|
* @param state New state of channel.
|
277
|
-
*/
|
283
|
+
*/
|
278
284
|
idempotent void channelStateChanged(Channel state);
|
279
285
|
};
|
280
286
|
|
@@ -285,7 +291,7 @@ module Murmur
|
|
285
291
|
/** Context for actions in the User menu. */
|
286
292
|
const int ContextUser = 0x04;
|
287
293
|
|
288
|
-
/** Callback interface for context actions. You need to supply one of these for
|
294
|
+
/** Callback interface for context actions. You need to supply one of these for {@link Server.addContext}.
|
289
295
|
* If an added callback ever throws an exception or goes away, it will be automatically removed.
|
290
296
|
* Please note that all callbacks are done asynchronously; murmur does not wait for the callback to
|
291
297
|
* complete before continuing processing.
|
@@ -300,11 +306,11 @@ module Murmur
|
|
300
306
|
idempotent void contextAction(string action, User usr, int session, int channelid);
|
301
307
|
};
|
302
308
|
|
303
|
-
/** Callback interface for server authentication. You need to supply one of these for
|
309
|
+
/** Callback interface for server authentication. You need to supply one of these for {@link Server.setAuthenticator}.
|
304
310
|
* If an added callback ever throws an exception or goes away, it will be automatically removed.
|
305
|
-
* Please note that unlike
|
311
|
+
* Please note that unlike {@link ServerCallback} and {@link ServerContextCallback}, these methods are called
|
306
312
|
* synchronously. If the response lags, the entire murmur server will lag.
|
307
|
-
* Also note that, as the method calls are synchronous, making a call to
|
313
|
+
* Also note that, as the method calls are synchronous, making a call to {@link Server} or {@link Meta} will
|
308
314
|
* deadlock the server.
|
309
315
|
*/
|
310
316
|
interface ServerAuthenticator {
|
@@ -329,7 +335,6 @@ module Murmur
|
|
329
335
|
/** Fetch information about a user. This is used to retrieve information like email address, keyhash etc. If you
|
330
336
|
* want murmur to take care of this information itself, simply return false to fall through.
|
331
337
|
* @param id User id.
|
332
|
-
* @param key Key of information to be retrieved.
|
333
338
|
* @param info Information about user. This needs to include at least "name".
|
334
339
|
* @return true if information is present, false to fall through.
|
335
340
|
*/
|
@@ -341,7 +346,7 @@ module Murmur
|
|
341
346
|
*/
|
342
347
|
idempotent int nameToId(string name);
|
343
348
|
|
344
|
-
/** Map a user to a
|
349
|
+
/** Map a user id to a username.
|
345
350
|
* @param id User id to map.
|
346
351
|
* @return Name of user or empty string for unknown id.
|
347
352
|
*/
|
@@ -357,7 +362,7 @@ module Murmur
|
|
357
362
|
/** Callback interface for server authentication and registration. This allows you to support both authentication
|
358
363
|
* and account updating.
|
359
364
|
* You do not need to implement this if all you want is authentication, you only need this if other scripts
|
360
|
-
* connected to the same server calls e.g.
|
365
|
+
* connected to the same server calls e.g. {@link Server.setTexture}.
|
361
366
|
* Almost all of these methods support fall through, meaning murmur should continue the operation against its
|
362
367
|
* own database.
|
363
368
|
*/
|
@@ -387,8 +392,8 @@ module Murmur
|
|
387
392
|
*/
|
388
393
|
idempotent int setInfo(int id, UserInfoMap info);
|
389
394
|
|
390
|
-
/** Set texture of user registration.
|
391
|
-
* @param id
|
395
|
+
/** Set texture (now called avatar) of user registration.
|
396
|
+
* @param id registrationId of registered user.
|
392
397
|
* @param tex New texture.
|
393
398
|
* @return 1 for successfull update, 0 for unsuccessfull update, -1 to fall through.
|
394
399
|
*/
|
@@ -397,149 +402,154 @@ module Murmur
|
|
397
402
|
|
398
403
|
/** Per-server interface. This includes all methods for configuring and altering
|
399
404
|
* the state of a single virtual server. You can retrieve a pointer to this interface
|
400
|
-
* from one of the methods in
|
405
|
+
* from one of the methods in {@link Meta}.
|
401
406
|
**/
|
402
407
|
["amd"] interface Server {
|
403
408
|
/** Shows if the server currently running (accepting users).
|
404
409
|
*
|
405
410
|
* @return Run-state of server.
|
406
411
|
*/
|
407
|
-
idempotent bool isRunning();
|
412
|
+
idempotent bool isRunning() throws InvalidSecretException;
|
408
413
|
|
409
414
|
/** Start server. */
|
410
|
-
void start() throws ServerBootedException, ServerFailureException;
|
415
|
+
void start() throws ServerBootedException, ServerFailureException, InvalidSecretException;
|
411
416
|
|
412
417
|
/** Stop server. */
|
413
|
-
void stop() throws ServerBootedException;
|
418
|
+
void stop() throws ServerBootedException, InvalidSecretException;
|
414
419
|
|
415
420
|
/** Delete server and all it's configuration. */
|
416
|
-
void delete() throws ServerBootedException;
|
421
|
+
void delete() throws ServerBootedException, InvalidSecretException;
|
417
422
|
|
418
423
|
/** Fetch the server id.
|
419
424
|
*
|
420
425
|
* @return Unique server id.
|
421
426
|
*/
|
422
|
-
idempotent int id();
|
427
|
+
idempotent int id() throws InvalidSecretException;
|
423
428
|
|
424
429
|
/** Add a callback. The callback will receive notifications about changes to users and channels.
|
425
430
|
*
|
426
431
|
* @param cb Callback interface which will receive notifications.
|
427
432
|
* @see removeCallback
|
428
433
|
*/
|
429
|
-
void addCallback(ServerCallback *cb) throws ServerBootedException, InvalidCallbackException;
|
434
|
+
void addCallback(ServerCallback *cb) throws ServerBootedException, InvalidCallbackException, InvalidSecretException;
|
430
435
|
|
431
436
|
/** Remove a callback.
|
432
437
|
*
|
433
438
|
* @param cb Callback interface to be removed.
|
434
439
|
* @see addCallback
|
435
440
|
*/
|
436
|
-
void removeCallback(ServerCallback *cb) throws ServerBootedException, InvalidCallbackException;
|
441
|
+
void removeCallback(ServerCallback *cb) throws ServerBootedException, InvalidCallbackException, InvalidSecretException;
|
437
442
|
|
438
443
|
/** Set external authenticator. If set, all authentications from clients are forwarded to this
|
439
444
|
* proxy.
|
440
445
|
*
|
441
446
|
* @param auth Authenticator object to perform subsequent authentications.
|
442
447
|
*/
|
443
|
-
void setAuthenticator(ServerAuthenticator *auth) throws ServerBootedException, InvalidCallbackException;
|
448
|
+
void setAuthenticator(ServerAuthenticator *auth) throws ServerBootedException, InvalidCallbackException, InvalidSecretException;
|
444
449
|
|
445
450
|
/** Retrieve configuration item.
|
446
451
|
* @param key Configuration key.
|
447
|
-
* @return Configuration value. If this is empty, see
|
452
|
+
* @return Configuration value. If this is empty, see {@link Meta.getDefaultConf}
|
448
453
|
*/
|
449
|
-
idempotent string getConf(string key);
|
454
|
+
idempotent string getConf(string key) throws InvalidSecretException;
|
450
455
|
|
451
456
|
/** Retrieve all configuration items.
|
452
|
-
* @return All configured values. If a value isn't set here, the value from
|
457
|
+
* @return All configured values. If a value isn't set here, the value from {@link Meta.getDefaultConf} is used.
|
453
458
|
*/
|
454
|
-
idempotent ConfigMap getAllConf();
|
459
|
+
idempotent ConfigMap getAllConf() throws InvalidSecretException;
|
455
460
|
|
456
461
|
/** Set a configuration item.
|
457
462
|
* @param key Configuration key.
|
458
463
|
* @param value Configuration value.
|
459
464
|
*/
|
460
|
-
idempotent void setConf(string key, string value);
|
465
|
+
idempotent void setConf(string key, string value) throws InvalidSecretException;
|
461
466
|
|
462
|
-
/** Set superuser password. This is just a convenience for using
|
467
|
+
/** Set superuser password. This is just a convenience for using {@link updateRegistration} on user id 0.
|
463
468
|
* @param pw Password.
|
464
469
|
*/
|
465
|
-
idempotent void setSuperuserPassword(string pw);
|
470
|
+
idempotent void setSuperuserPassword(string pw) throws InvalidSecretException;
|
466
471
|
|
467
472
|
/** Fetch log entries.
|
468
473
|
* @param first Lowest numbered entry to fetch. 0 is the most recent item.
|
469
474
|
* @param last Last entry to fetch.
|
470
475
|
* @return List of log entries.
|
471
476
|
*/
|
472
|
-
idempotent LogList getLog(int first, int last);
|
477
|
+
idempotent LogList getLog(int first, int last) throws InvalidSecretException;
|
478
|
+
|
479
|
+
/** Fetch length of log
|
480
|
+
* @return Number of entries in log
|
481
|
+
*/
|
482
|
+
idempotent int getLogLen() throws InvalidSecretException;
|
473
483
|
|
474
484
|
/** Fetch all users. This returns all currently connected users on the server.
|
475
485
|
* @return List of connected users.
|
476
486
|
* @see getState
|
477
487
|
*/
|
478
|
-
idempotent UserMap getUsers() throws ServerBootedException;
|
488
|
+
idempotent UserMap getUsers() throws ServerBootedException, InvalidSecretException;
|
479
489
|
|
480
490
|
/** Fetch all channels. This returns all defined channels on the server. The root channel is always channel 0.
|
481
491
|
* @return List of defined channels.
|
482
492
|
* @see getChannelState
|
483
493
|
*/
|
484
|
-
idempotent ChannelMap getChannels() throws ServerBootedException;
|
494
|
+
idempotent ChannelMap getChannels() throws ServerBootedException, InvalidSecretException;
|
485
495
|
|
486
496
|
/** Fetch certificate of user. This returns the complete certificate chain of a user.
|
487
|
-
* @param session Connection ID of user. See
|
497
|
+
* @param session Connection ID of user. See {@link User.session}.
|
488
498
|
* @return Certificate list of user.
|
489
499
|
*/
|
490
|
-
idempotent CertificateList getCertificateList(int session) throws ServerBootedException, InvalidSessionException;
|
500
|
+
idempotent CertificateList getCertificateList(int session) throws ServerBootedException, InvalidSessionException, InvalidSecretException;
|
491
501
|
|
492
502
|
/** Fetch all channels and connected users as a tree. This retrieves an easy-to-use representation of the server
|
493
503
|
* as a tree. This is primarily used for viewing the state of the server on a webpage.
|
494
504
|
* @return Recursive tree of all channels and connected users.
|
495
505
|
*/
|
496
|
-
idempotent Tree getTree() throws ServerBootedException;
|
506
|
+
idempotent Tree getTree() throws ServerBootedException, InvalidSecretException;
|
497
507
|
|
498
508
|
/** Fetch all current IP bans on the server.
|
499
509
|
* @return List of bans.
|
500
510
|
*/
|
501
|
-
idempotent BanList getBans() throws ServerBootedException;
|
511
|
+
idempotent BanList getBans() throws ServerBootedException, InvalidSecretException;
|
502
512
|
|
503
|
-
/** Set all current IP bans on the server. This will replace any bans already present, so if you want to add a ban, be sure to call
|
513
|
+
/** Set all current IP bans on the server. This will replace any bans already present, so if you want to add a ban, be sure to call {@link getBans} and then
|
504
514
|
* append to the returned list before calling this method.
|
505
515
|
* @param bans List of bans.
|
506
516
|
*/
|
507
|
-
idempotent void setBans(BanList bans) throws ServerBootedException;
|
517
|
+
idempotent void setBans(BanList bans) throws ServerBootedException, InvalidSecretException;
|
508
518
|
|
509
519
|
/** Kick a user. The user is not banned, and is free to rejoin the server.
|
510
|
-
* @param session Connection ID of user. See
|
520
|
+
* @param session Connection ID of user. See {@link User.session}.
|
511
521
|
* @param reason Text message to show when user is kicked.
|
512
522
|
*/
|
513
|
-
void kickUser(int session, string reason) throws ServerBootedException, InvalidSessionException;
|
523
|
+
void kickUser(int session, string reason) throws ServerBootedException, InvalidSessionException, InvalidSecretException;
|
514
524
|
|
515
525
|
/** Get state of a single connected user.
|
516
|
-
* @param session Connection ID of user. See
|
526
|
+
* @param session Connection ID of user. See {@link User.session}.
|
517
527
|
* @return State of connected user.
|
518
528
|
* @see setState
|
519
529
|
* @see getUsers
|
520
530
|
*/
|
521
|
-
idempotent User getState(int session) throws ServerBootedException, InvalidSessionException;
|
531
|
+
idempotent User getState(int session) throws ServerBootedException, InvalidSessionException, InvalidSecretException;
|
522
532
|
|
523
533
|
/** Set user state. You can use this to move, mute and deafen users.
|
524
534
|
* @param state User state to set.
|
525
535
|
* @see getState
|
526
536
|
*/
|
527
|
-
idempotent void setState(User state) throws ServerBootedException, InvalidSessionException, InvalidChannelException;
|
537
|
+
idempotent void setState(User state) throws ServerBootedException, InvalidSessionException, InvalidChannelException, InvalidSecretException;
|
528
538
|
|
529
539
|
/** Send text message to a single user.
|
530
|
-
* @param session Connection ID of user. See
|
540
|
+
* @param session Connection ID of user. See {@link User.session}.
|
531
541
|
* @param text Message to send.
|
532
542
|
* @see sendMessageChannel
|
533
543
|
*/
|
534
|
-
void sendMessage(int session, string text) throws ServerBootedException, InvalidSessionException;
|
544
|
+
void sendMessage(int session, string text) throws ServerBootedException, InvalidSessionException, InvalidSecretException;
|
535
545
|
|
536
546
|
/** Check if user is permitted to perform action.
|
537
|
-
* @param session Connection ID of user. See
|
538
|
-
* @param channelid ID of Channel. See
|
547
|
+
* @param session Connection ID of user. See {@link User.session}.
|
548
|
+
* @param channelid ID of Channel. See {@link Channel.id}.
|
539
549
|
* @param perm Permission bits to check.
|
540
550
|
* @return true if any of the permissions in perm were set for the user.
|
541
551
|
*/
|
542
|
-
bool hasPermission(int session, int channelid, int perm) throws ServerBootedException, InvalidSessionException, InvalidChannelException;
|
552
|
+
bool hasPermission(int session, int channelid, int perm) throws ServerBootedException, InvalidSessionException, InvalidChannelException, InvalidSecretException;
|
543
553
|
|
544
554
|
/** Add a context callback. This is done per user, and will add a context menu action for the user.
|
545
555
|
*
|
@@ -547,163 +557,163 @@ module Murmur
|
|
547
557
|
* @param action Action string, a unique name to associate with the action.
|
548
558
|
* @param text Name of action shown to user.
|
549
559
|
* @param cb Callback interface which will receive notifications.
|
550
|
-
* @param ctx Context this should be used in. Needs to be one or a combination of
|
560
|
+
* @param ctx Context this should be used in. Needs to be one or a combination of {@link ContextServer}, {@link ContextChannel} and {@link ContextUser}.
|
551
561
|
* @see removeContextCallback
|
552
562
|
*/
|
553
|
-
void addContextCallback(int session, string action, string text, ServerContextCallback *cb, int ctx) throws ServerBootedException, InvalidCallbackException;
|
563
|
+
void addContextCallback(int session, string action, string text, ServerContextCallback *cb, int ctx) throws ServerBootedException, InvalidCallbackException, InvalidSecretException;
|
554
564
|
|
555
565
|
/** Remove a callback.
|
556
566
|
*
|
557
567
|
* @param cb Callback interface to be removed. This callback will be removed from all from all users.
|
558
568
|
* @see addContextCallback
|
559
569
|
*/
|
560
|
-
void removeContextCallback(ServerContextCallback *cb) throws ServerBootedException, InvalidCallbackException;
|
570
|
+
void removeContextCallback(ServerContextCallback *cb) throws ServerBootedException, InvalidCallbackException, InvalidSecretException;
|
561
571
|
|
562
572
|
/** Get state of single channel.
|
563
|
-
* @param channelid ID of Channel. See
|
573
|
+
* @param channelid ID of Channel. See {@link Channel.id}.
|
564
574
|
* @return State of channel.
|
565
575
|
* @see setChannelState
|
566
576
|
* @see getChannels
|
567
577
|
*/
|
568
|
-
idempotent Channel getChannelState(int channelid) throws ServerBootedException, InvalidChannelException;
|
578
|
+
idempotent Channel getChannelState(int channelid) throws ServerBootedException, InvalidChannelException, InvalidSecretException;
|
569
579
|
|
570
580
|
/** Set state of a single channel. You can use this to move or relink channels.
|
571
581
|
* @param state Channel state to set.
|
572
582
|
* @see getChannelState
|
573
583
|
*/
|
574
|
-
idempotent void setChannelState(Channel state) throws ServerBootedException, InvalidChannelException;
|
584
|
+
idempotent void setChannelState(Channel state) throws ServerBootedException, InvalidChannelException, InvalidSecretException;
|
575
585
|
|
576
586
|
/** Remove a channel and all its subchannels.
|
577
|
-
* @param channelid ID of Channel. See
|
587
|
+
* @param channelid ID of Channel. See {@link Channel.id}.
|
578
588
|
*/
|
579
|
-
void removeChannel(int channelid) throws ServerBootedException, InvalidChannelException;
|
589
|
+
void removeChannel(int channelid) throws ServerBootedException, InvalidChannelException, InvalidSecretException;
|
580
590
|
|
581
591
|
/** Add a new channel.
|
582
592
|
* @param name Name of new channel.
|
583
|
-
* @param parent Channel ID of parent channel. See
|
593
|
+
* @param parent Channel ID of parent channel. See {@link Channel.id}.
|
584
594
|
* @return ID of newly created channel.
|
585
595
|
*/
|
586
|
-
int addChannel(string name, int parent) throws ServerBootedException, InvalidChannelException;
|
596
|
+
int addChannel(string name, int parent) throws ServerBootedException, InvalidChannelException, InvalidSecretException;
|
587
597
|
|
588
598
|
/** Send text message to channel or a tree of channels.
|
589
|
-
* @param channelid Channel ID of channel to send to. See
|
599
|
+
* @param channelid Channel ID of channel to send to. See {@link Channel.id}.
|
590
600
|
* @param tree If true, the message will be sent to the channel and all its subchannels.
|
591
601
|
* @param text Message to send.
|
592
602
|
* @see sendMessage
|
593
603
|
*/
|
594
|
-
void sendMessageChannel(int channelid, bool tree, string text) throws ServerBootedException, InvalidChannelException;
|
604
|
+
void sendMessageChannel(int channelid, bool tree, string text) throws ServerBootedException, InvalidChannelException, InvalidSecretException;
|
595
605
|
|
596
606
|
/** Retrieve ACLs and Groups on a channel.
|
597
|
-
* @param channelid Channel ID of channel to fetch from. See
|
607
|
+
* @param channelid Channel ID of channel to fetch from. See {@link Channel.id}.
|
598
608
|
* @param acls List of ACLs on the channel. This will include inherited ACLs.
|
599
609
|
* @param groups List of groups on the channel. This will include inherited groups.
|
600
610
|
* @param inherit Does this channel inherit ACLs from the parent channel?
|
601
611
|
*/
|
602
|
-
idempotent void getACL(int channelid, out ACLList acls, out GroupList groups, out bool inherit) throws ServerBootedException, InvalidChannelException;
|
612
|
+
idempotent void getACL(int channelid, out ACLList acls, out GroupList groups, out bool inherit) throws ServerBootedException, InvalidChannelException, InvalidSecretException;
|
603
613
|
|
604
614
|
/** Set ACLs and Groups on a channel. Note that this will replace all existing ACLs and groups on the channel.
|
605
|
-
* @param channelid Channel ID of channel to fetch from. See
|
615
|
+
* @param channelid Channel ID of channel to fetch from. See {@link Channel.id}.
|
606
616
|
* @param acls List of ACLs on the channel.
|
607
617
|
* @param groups List of groups on the channel.
|
608
618
|
* @param inherit Should this channel inherit ACLs from the parent channel?
|
609
619
|
*/
|
610
|
-
idempotent void setACL(int channelid, ACLList acls, GroupList groups, bool inherit) throws ServerBootedException, InvalidChannelException;
|
620
|
+
idempotent void setACL(int channelid, ACLList acls, GroupList groups, bool inherit) throws ServerBootedException, InvalidChannelException, InvalidSecretException;
|
611
621
|
|
612
622
|
/** Temporarily add a user to a group on a channel. This state is not saved, and is intended for temporary memberships.
|
613
|
-
* @param channelid Channel ID of channel to add to. See
|
614
|
-
* @param session Connection ID of user. See
|
623
|
+
* @param channelid Channel ID of channel to add to. See {@link Channel.id}.
|
624
|
+
* @param session Connection ID of user. See {@link User.session}.
|
615
625
|
* @param group Group name to add to.
|
616
626
|
*/
|
617
|
-
idempotent void addUserToGroup(int channelid, int session, string group) throws ServerBootedException, InvalidChannelException, InvalidSessionException;
|
627
|
+
idempotent void addUserToGroup(int channelid, int session, string group) throws ServerBootedException, InvalidChannelException, InvalidSessionException, InvalidSecretException;
|
618
628
|
|
619
629
|
/** Remove a user from a temporary group membership on a channel. This state is not saved, and is intended for temporary memberships.
|
620
|
-
* @param channelid Channel ID of channel to add to. See
|
621
|
-
* @param session Connection ID of user. See
|
630
|
+
* @param channelid Channel ID of channel to add to. See {@link Channel.id}.
|
631
|
+
* @param session Connection ID of user. See {@link User.session}.
|
622
632
|
* @param group Group name to remove from.
|
623
633
|
*/
|
624
|
-
idempotent void removeUserFromGroup(int channelid, int session, string group) throws ServerBootedException, InvalidChannelException, InvalidSessionException;
|
634
|
+
idempotent void removeUserFromGroup(int channelid, int session, string group) throws ServerBootedException, InvalidChannelException, InvalidSessionException, InvalidSecretException;
|
625
635
|
|
626
636
|
/** Redirect whisper targets for user. If set, whenever a user tries to whisper to group "source", the whisper will be redirected to group "target".
|
627
637
|
* To remove a redirect pass an empty target string. This is intended for context groups.
|
628
|
-
* @param session Connection ID of user. See
|
638
|
+
* @param session Connection ID of user. See {@link User.session}.
|
629
639
|
* @param source Group name to redirect from.
|
630
640
|
* @param target Group name to redirect to.
|
631
641
|
*/
|
632
|
-
idempotent void redirectWhisperGroup(int session, string source, string target) throws ServerBootedException, InvalidSessionException;
|
642
|
+
idempotent void redirectWhisperGroup(int session, string source, string target) throws ServerBootedException, InvalidSessionException, InvalidSecretException;
|
633
643
|
|
634
|
-
/** Map a list of
|
644
|
+
/** Map a list of {@link User.userid} to a matching name.
|
635
645
|
* @param List of ids.
|
636
646
|
* @return Matching list of names, with an empty string representing invalid or unknown ids.
|
637
647
|
*/
|
638
|
-
idempotent NameMap getUserNames(IdList ids) throws ServerBootedException;
|
648
|
+
idempotent NameMap getUserNames(IdList ids) throws ServerBootedException, InvalidSecretException;
|
639
649
|
|
640
650
|
/** Map a list of user names to a matching id.
|
641
651
|
* @param List of names.
|
642
652
|
* @reuturn List of matching ids, with -1 representing invalid or unknown user names.
|
643
653
|
*/
|
644
|
-
idempotent IdMap getUserIds(NameList names) throws ServerBootedException;
|
654
|
+
idempotent IdMap getUserIds(NameList names) throws ServerBootedException, InvalidSecretException;
|
645
655
|
|
646
656
|
/** Register a new user.
|
647
657
|
* @param info Information about new user. Must include at least "name".
|
648
|
-
* @return The ID of the user. See
|
658
|
+
* @return The ID of the user. See {@link RegisteredUser.userid}.
|
649
659
|
*/
|
650
|
-
int registerUser(UserInfoMap info) throws ServerBootedException, InvalidUserException;
|
660
|
+
int registerUser(UserInfoMap info) throws ServerBootedException, InvalidUserException, InvalidSecretException;
|
651
661
|
|
652
662
|
/** Remove a user registration.
|
653
|
-
* @param userid ID of registered user. See
|
663
|
+
* @param userid ID of registered user. See {@link RegisteredUser.userid}.
|
654
664
|
*/
|
655
|
-
void unregisterUser(int userid) throws ServerBootedException, InvalidUserException;
|
665
|
+
void unregisterUser(int userid) throws ServerBootedException, InvalidUserException, InvalidSecretException;
|
656
666
|
|
657
667
|
/** Update the registration for a user. You can use this to set the email or password of a user,
|
658
668
|
* and can also use it to change the user's name.
|
659
669
|
* @param registration Updated registration record.
|
660
670
|
*/
|
661
|
-
idempotent void updateRegistration(int userid, UserInfoMap info) throws ServerBootedException, InvalidUserException;
|
671
|
+
idempotent void updateRegistration(int userid, UserInfoMap info) throws ServerBootedException, InvalidUserException, InvalidSecretException;
|
662
672
|
|
663
673
|
/** Fetch registration for a single user.
|
664
|
-
* @param userid ID of registered user. See
|
674
|
+
* @param userid ID of registered user. See {@link RegisteredUser.userid}.
|
665
675
|
* @return Registration record.
|
666
676
|
*/
|
667
|
-
idempotent UserInfoMap getRegistration(int userid) throws ServerBootedException, InvalidUserException;
|
677
|
+
idempotent UserInfoMap getRegistration(int userid) throws ServerBootedException, InvalidUserException, InvalidSecretException;
|
668
678
|
|
669
679
|
/** Fetch a group of registered users.
|
670
680
|
* @param filter Substring of user name. If blank, will retrieve all registered users.
|
671
681
|
* @return List of registration records.
|
672
682
|
*/
|
673
|
-
idempotent NameMap getRegisteredUsers(string filter) throws ServerBootedException;
|
683
|
+
idempotent NameMap getRegisteredUsers(string filter) throws ServerBootedException, InvalidSecretException;
|
674
684
|
|
675
685
|
/** Verify the password of a user. You can use this to verify a user's credentials.
|
676
|
-
* @param name User name. See
|
686
|
+
* @param name User name. See {@link RegisteredUser.name}.
|
677
687
|
* @param pw User password.
|
678
|
-
* @return User ID of registered user (See
|
688
|
+
* @return User ID of registered user (See {@link RegisteredUser.userid}), -1 for failed authentication or -2 for unknown usernames.
|
679
689
|
*/
|
680
|
-
idempotent int verifyPassword(string name, string pw) throws ServerBootedException;
|
690
|
+
idempotent int verifyPassword(string name, string pw) throws ServerBootedException, InvalidSecretException;
|
681
691
|
|
682
692
|
/** Fetch user texture. Textures are stored as zlib compress()ed 600x60 32-bit BGRA data.
|
683
|
-
* @param userid ID of registered user. See
|
693
|
+
* @param userid ID of registered user. See {@link RegisteredUser.userid}.
|
684
694
|
* @return Custom texture associated with user or an empty texture.
|
685
695
|
*/
|
686
|
-
idempotent Texture getTexture(int userid) throws ServerBootedException, InvalidUserException;
|
696
|
+
idempotent Texture getTexture(int userid) throws ServerBootedException, InvalidUserException, InvalidSecretException;
|
687
697
|
|
688
|
-
/** Set
|
689
|
-
* @param userid ID of registered user. See
|
690
|
-
* @param tex Texture to set for the user, or an empty texture to remove the existing texture.
|
698
|
+
/** Set a user texture (now called avatar).
|
699
|
+
* @param userid ID of registered user. See {@link RegisteredUser.userid}.
|
700
|
+
* @param tex Texture (as a Byte-Array) to set for the user, or an empty texture to remove the existing texture.
|
691
701
|
*/
|
692
|
-
idempotent void setTexture(int userid, Texture tex) throws ServerBootedException, InvalidUserException, InvalidTextureException;
|
702
|
+
idempotent void setTexture(int userid, Texture tex) throws ServerBootedException, InvalidUserException, InvalidTextureException, InvalidSecretException;
|
693
703
|
|
694
704
|
/** Get virtual server uptime.
|
695
705
|
* @return Uptime of the virtual server in seconds
|
696
706
|
*/
|
697
|
-
idempotent int getUptime() throws ServerBootedException;
|
707
|
+
idempotent int getUptime() throws ServerBootedException, InvalidSecretException;
|
698
708
|
};
|
699
709
|
|
700
|
-
/** Callback interface for Meta. You can supply an implementation of this to
|
710
|
+
/** Callback interface for Meta. You can supply an implementation of this to receive notifications
|
701
711
|
* when servers are stopped or started.
|
702
712
|
* If an added callback ever throws an exception or goes away, it will be automatically removed.
|
703
713
|
* Please note that all callbacks are done asynchronously; murmur does not wait for the callback to
|
704
714
|
* complete before continuing processing.
|
705
715
|
* @see ServerCallback
|
706
|
-
* @see Meta
|
716
|
+
* @see Meta.addCallback
|
707
717
|
*/
|
708
718
|
interface MetaCallback {
|
709
719
|
/** Called when a server is started. The server is up and running when this event is sent, so all methods that
|
@@ -721,29 +731,29 @@ module Murmur
|
|
721
731
|
|
722
732
|
sequence<Server *> ServerList;
|
723
733
|
|
724
|
-
/** This is the meta interface. It is primarily used for retrieving the
|
734
|
+
/** This is the meta interface. It is primarily used for retrieving the {@link Server} interfaces for each individual server.
|
725
735
|
**/
|
726
736
|
["amd"] interface Meta {
|
727
737
|
/** Fetch interface to specific server.
|
728
|
-
* @param id Server ID. See
|
738
|
+
* @param id Server ID. See {@link Server.getId}.
|
729
739
|
* @return Interface for specified server, or a null proxy if id is invalid.
|
730
740
|
*/
|
731
|
-
idempotent Server *getServer(int id);
|
741
|
+
idempotent Server *getServer(int id) throws InvalidSecretException;
|
732
742
|
|
733
|
-
/** Create a new server. Call
|
743
|
+
/** Create a new server. Call {@link Server.getId} on the returned interface to find it's ID.
|
734
744
|
* @return Interface for new server.
|
735
745
|
*/
|
736
|
-
Server *newServer();
|
746
|
+
Server *newServer() throws InvalidSecretException;
|
737
747
|
|
738
748
|
/** Fetch list of all currently running servers.
|
739
749
|
* @return List of interfaces for running servers.
|
740
750
|
*/
|
741
|
-
idempotent ServerList getBootedServers();
|
751
|
+
idempotent ServerList getBootedServers() throws InvalidSecretException;
|
742
752
|
|
743
753
|
/** Fetch list of all defined servers.
|
744
754
|
* @return List of interfaces for all servers.
|
745
755
|
*/
|
746
|
-
idempotent ServerList getAllServers();
|
756
|
+
idempotent ServerList getAllServers() throws InvalidSecretException;
|
747
757
|
|
748
758
|
/** Fetch default configuraion. This returns the configuration items that were set in the configuration file, or
|
749
759
|
* the built-in default. The individual servers will use these values unless they have been overridden in the
|
@@ -751,13 +761,13 @@ module Murmur
|
|
751
761
|
* the servers ID - 1 (so that virtual server #1 uses the defined port, server #2 uses port+1 etc).
|
752
762
|
* @return Default configuration of the servers.
|
753
763
|
*/
|
754
|
-
idempotent ConfigMap getDefaultConf();
|
764
|
+
idempotent ConfigMap getDefaultConf() throws InvalidSecretException;
|
755
765
|
|
756
766
|
/** Fetch version of Murmur.
|
757
767
|
* @param major Major version.
|
758
768
|
* @param minor Minor version.
|
759
769
|
* @param patch Patchlevel.
|
760
|
-
* @param text Textual representation of version. Note that this may not match the
|
770
|
+
* @param text Textual representation of version. Note that this may not match the {@link major}, {@link minor} and {@link patch} levels, as it
|
761
771
|
* may be simply the compile date or the SVN revision. This is usually the text you want to present to users.
|
762
772
|
*/
|
763
773
|
idempotent void getVersion(out int major, out int minor, out int patch, out string text);
|
@@ -766,17 +776,27 @@ module Murmur
|
|
766
776
|
*
|
767
777
|
* @param cb Callback interface which will receive notifications.
|
768
778
|
*/
|
769
|
-
void addCallback(MetaCallback *cb) throws InvalidCallbackException;
|
779
|
+
void addCallback(MetaCallback *cb) throws InvalidCallbackException, InvalidSecretException;
|
770
780
|
|
771
781
|
/** Remove a callback.
|
772
782
|
*
|
773
783
|
* @param cb Callback interface to be removed.
|
774
784
|
*/
|
775
|
-
void removeCallback(MetaCallback *cb) throws InvalidCallbackException;
|
785
|
+
void removeCallback(MetaCallback *cb) throws InvalidCallbackException, InvalidSecretException;
|
776
786
|
|
777
787
|
/** Get murmur uptime.
|
778
788
|
* @return Uptime of murmur in seconds
|
779
789
|
*/
|
780
790
|
idempotent int getUptime();
|
791
|
+
|
792
|
+
/** Get slice file.
|
793
|
+
* @return Contents of the slice file server compiled with.
|
794
|
+
*/
|
795
|
+
idempotent string getSlice();
|
796
|
+
|
797
|
+
/** Returns a checksum dict for the slice file.
|
798
|
+
* @return Checksum dict
|
799
|
+
*/
|
800
|
+
idempotent Ice::SliceChecksumDict getSliceChecksums();
|
781
801
|
};
|
782
802
|
};
|
data/vendor/ice/Murmur.rb
CHANGED
@@ -1,16 +1,24 @@
|
|
1
1
|
# **********************************************************************
|
2
2
|
#
|
3
|
-
# Copyright (c) 2003-
|
3
|
+
# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
|
4
4
|
#
|
5
5
|
# This copy of Ice is licensed to you under the terms described in the
|
6
6
|
# ICE_LICENSE file included in this distribution.
|
7
7
|
#
|
8
8
|
# **********************************************************************
|
9
9
|
|
10
|
-
# Ice version 3.
|
10
|
+
# Ice version 3.4.1
|
11
|
+
|
12
|
+
# <auto-generated>
|
13
|
+
#
|
11
14
|
# Generated from file `Murmur.ice'
|
15
|
+
#
|
16
|
+
# Warning: do not edit this file.
|
17
|
+
#
|
18
|
+
# </auto-generated>
|
12
19
|
|
13
20
|
require 'Ice'
|
21
|
+
require 'Ice/SliceChecksumDict.rb'
|
14
22
|
|
15
23
|
module Murmur
|
16
24
|
|
@@ -20,14 +28,16 @@ module Murmur
|
|
20
28
|
|
21
29
|
if not defined?(::Murmur::User)
|
22
30
|
class User
|
23
|
-
def initialize(session=0, userid=0, mute=false, deaf=false, suppress=false, selfMute=false, selfDeaf=false, channel=0, name='', onlinesecs=0, bytespersec=0, version=0, release='', os='', osversion='', identity='', context='', comment='', address=nil, tcponly=false, idlesecs=0)
|
31
|
+
def initialize(session=0, userid=0, mute=false, deaf=false, suppress=false, prioritySpeaker=false, selfMute=false, selfDeaf=false, recording=false, channel=0, name='', onlinesecs=0, bytespersec=0, version=0, release='', os='', osversion='', identity='', context='', comment='', address=nil, tcponly=false, idlesecs=0)
|
24
32
|
@session = session
|
25
33
|
@userid = userid
|
26
34
|
@mute = mute
|
27
35
|
@deaf = deaf
|
28
36
|
@suppress = suppress
|
37
|
+
@prioritySpeaker = prioritySpeaker
|
29
38
|
@selfMute = selfMute
|
30
39
|
@selfDeaf = selfDeaf
|
40
|
+
@recording = recording
|
31
41
|
@channel = channel
|
32
42
|
@name = name
|
33
43
|
@onlinesecs = onlinesecs
|
@@ -51,8 +61,10 @@ module Murmur
|
|
51
61
|
_h = 5 * _h + @mute.hash
|
52
62
|
_h = 5 * _h + @deaf.hash
|
53
63
|
_h = 5 * _h + @suppress.hash
|
64
|
+
_h = 5 * _h + @prioritySpeaker.hash
|
54
65
|
_h = 5 * _h + @selfMute.hash
|
55
66
|
_h = 5 * _h + @selfDeaf.hash
|
67
|
+
_h = 5 * _h + @recording.hash
|
56
68
|
_h = 5 * _h + @channel.hash
|
57
69
|
_h = 5 * _h + @name.hash
|
58
70
|
_h = 5 * _h + @onlinesecs.hash
|
@@ -77,8 +89,10 @@ module Murmur
|
|
77
89
|
@mute != other.mute or
|
78
90
|
@deaf != other.deaf or
|
79
91
|
@suppress != other.suppress or
|
92
|
+
@prioritySpeaker != other.prioritySpeaker or
|
80
93
|
@selfMute != other.selfMute or
|
81
94
|
@selfDeaf != other.selfDeaf or
|
95
|
+
@recording != other.recording or
|
82
96
|
@channel != other.channel or
|
83
97
|
@name != other.name or
|
84
98
|
@onlinesecs != other.onlinesecs or
|
@@ -104,7 +118,7 @@ module Murmur
|
|
104
118
|
::Ice::__stringify(self, T_User)
|
105
119
|
end
|
106
120
|
|
107
|
-
attr_accessor :session, :userid, :mute, :deaf, :suppress, :selfMute, :selfDeaf, :channel, :name, :onlinesecs, :bytespersec, :version, :release, :os, :osversion, :identity, :context, :comment, :address, :tcponly, :idlesecs
|
121
|
+
attr_accessor :session, :userid, :mute, :deaf, :suppress, :prioritySpeaker, :selfMute, :selfDeaf, :recording, :channel, :name, :onlinesecs, :bytespersec, :version, :release, :os, :osversion, :identity, :context, :comment, :address, :tcponly, :idlesecs
|
108
122
|
end
|
109
123
|
|
110
124
|
T_User = ::Ice::__defineStruct('::Murmur::User', User, [
|
@@ -113,8 +127,10 @@ module Murmur
|
|
113
127
|
["mute", ::Ice::T_bool],
|
114
128
|
["deaf", ::Ice::T_bool],
|
115
129
|
["suppress", ::Ice::T_bool],
|
130
|
+
["prioritySpeaker", ::Ice::T_bool],
|
116
131
|
["selfMute", ::Ice::T_bool],
|
117
132
|
["selfDeaf", ::Ice::T_bool],
|
133
|
+
["recording", ::Ice::T_bool],
|
118
134
|
["channel", ::Ice::T_int],
|
119
135
|
["name", ::Ice::T_string],
|
120
136
|
["onlinesecs", ::Ice::T_int],
|
@@ -501,12 +517,12 @@ module Murmur
|
|
501
517
|
include Comparable
|
502
518
|
|
503
519
|
def initialize(val)
|
504
|
-
fail("invalid value #{val} for UserInfo") unless(val >= 0 and val <
|
520
|
+
fail("invalid value #{val} for UserInfo") unless(val >= 0 and val < 6)
|
505
521
|
@val = val
|
506
522
|
end
|
507
523
|
|
508
524
|
def UserInfo.from_int(val)
|
509
|
-
raise IndexError, "#{val} is out of range 0..
|
525
|
+
raise IndexError, "#{val} is out of range 0..5" if(val < 0 || val > 5)
|
510
526
|
@@_values[val]
|
511
527
|
end
|
512
528
|
|
@@ -535,19 +551,20 @@ module Murmur
|
|
535
551
|
@@_values.each(&block)
|
536
552
|
end
|
537
553
|
|
538
|
-
@@_names = ['UserName', 'UserEmail', 'UserComment', 'UserHash', 'UserPassword']
|
539
|
-
@@_values = [UserInfo.new(0), UserInfo.new(1), UserInfo.new(2), UserInfo.new(3), UserInfo.new(4)]
|
554
|
+
@@_names = ['UserName', 'UserEmail', 'UserComment', 'UserHash', 'UserPassword', 'UserLastActive']
|
555
|
+
@@_values = [UserInfo.new(0), UserInfo.new(1), UserInfo.new(2), UserInfo.new(3), UserInfo.new(4), UserInfo.new(5)]
|
540
556
|
|
541
557
|
UserName = @@_values[0]
|
542
558
|
UserEmail = @@_values[1]
|
543
559
|
UserComment = @@_values[2]
|
544
560
|
UserHash = @@_values[3]
|
545
561
|
UserPassword = @@_values[4]
|
562
|
+
UserLastActive = @@_values[5]
|
546
563
|
|
547
564
|
private_class_method :new
|
548
565
|
end
|
549
566
|
|
550
|
-
T_UserInfo = ::Ice::__defineEnum('::Murmur::UserInfo', UserInfo, [UserInfo::UserName, UserInfo::UserEmail, UserInfo::UserComment, UserInfo::UserHash, UserInfo::UserPassword])
|
567
|
+
T_UserInfo = ::Ice::__defineEnum('::Murmur::UserInfo', UserInfo, [UserInfo::UserName, UserInfo::UserEmail, UserInfo::UserComment, UserInfo::UserHash, UserInfo::UserPassword, UserInfo::UserLastActive])
|
551
568
|
end
|
552
569
|
|
553
570
|
if not defined?(::Murmur::T_UserMap)
|
@@ -691,10 +708,6 @@ module Murmur
|
|
691
708
|
def to_s
|
692
709
|
'Murmur::MurmurException'
|
693
710
|
end
|
694
|
-
|
695
|
-
def inspect
|
696
|
-
return ::Ice::__stringifyException(self)
|
697
|
-
end
|
698
711
|
end
|
699
712
|
|
700
713
|
T_MurmurException = ::Ice::__defineException('::Murmur::MurmurException', MurmurException, nil, [])
|
@@ -709,10 +722,6 @@ module Murmur
|
|
709
722
|
def to_s
|
710
723
|
'Murmur::InvalidSessionException'
|
711
724
|
end
|
712
|
-
|
713
|
-
def inspect
|
714
|
-
return ::Ice::__stringifyException(self)
|
715
|
-
end
|
716
725
|
end
|
717
726
|
|
718
727
|
T_InvalidSessionException = ::Ice::__defineException('::Murmur::InvalidSessionException', InvalidSessionException, ::Murmur::T_MurmurException, [])
|
@@ -727,10 +736,6 @@ module Murmur
|
|
727
736
|
def to_s
|
728
737
|
'Murmur::InvalidChannelException'
|
729
738
|
end
|
730
|
-
|
731
|
-
def inspect
|
732
|
-
return ::Ice::__stringifyException(self)
|
733
|
-
end
|
734
739
|
end
|
735
740
|
|
736
741
|
T_InvalidChannelException = ::Ice::__defineException('::Murmur::InvalidChannelException', InvalidChannelException, ::Murmur::T_MurmurException, [])
|
@@ -745,10 +750,6 @@ module Murmur
|
|
745
750
|
def to_s
|
746
751
|
'Murmur::InvalidServerException'
|
747
752
|
end
|
748
|
-
|
749
|
-
def inspect
|
750
|
-
return ::Ice::__stringifyException(self)
|
751
|
-
end
|
752
753
|
end
|
753
754
|
|
754
755
|
T_InvalidServerException = ::Ice::__defineException('::Murmur::InvalidServerException', InvalidServerException, ::Murmur::T_MurmurException, [])
|
@@ -763,10 +764,6 @@ module Murmur
|
|
763
764
|
def to_s
|
764
765
|
'Murmur::ServerBootedException'
|
765
766
|
end
|
766
|
-
|
767
|
-
def inspect
|
768
|
-
return ::Ice::__stringifyException(self)
|
769
|
-
end
|
770
767
|
end
|
771
768
|
|
772
769
|
T_ServerBootedException = ::Ice::__defineException('::Murmur::ServerBootedException', ServerBootedException, ::Murmur::T_MurmurException, [])
|
@@ -781,10 +778,6 @@ module Murmur
|
|
781
778
|
def to_s
|
782
779
|
'Murmur::ServerFailureException'
|
783
780
|
end
|
784
|
-
|
785
|
-
def inspect
|
786
|
-
return ::Ice::__stringifyException(self)
|
787
|
-
end
|
788
781
|
end
|
789
782
|
|
790
783
|
T_ServerFailureException = ::Ice::__defineException('::Murmur::ServerFailureException', ServerFailureException, ::Murmur::T_MurmurException, [])
|
@@ -799,10 +792,6 @@ module Murmur
|
|
799
792
|
def to_s
|
800
793
|
'Murmur::InvalidUserException'
|
801
794
|
end
|
802
|
-
|
803
|
-
def inspect
|
804
|
-
return ::Ice::__stringifyException(self)
|
805
|
-
end
|
806
795
|
end
|
807
796
|
|
808
797
|
T_InvalidUserException = ::Ice::__defineException('::Murmur::InvalidUserException', InvalidUserException, ::Murmur::T_MurmurException, [])
|
@@ -817,10 +806,6 @@ module Murmur
|
|
817
806
|
def to_s
|
818
807
|
'Murmur::InvalidTextureException'
|
819
808
|
end
|
820
|
-
|
821
|
-
def inspect
|
822
|
-
return ::Ice::__stringifyException(self)
|
823
|
-
end
|
824
809
|
end
|
825
810
|
|
826
811
|
T_InvalidTextureException = ::Ice::__defineException('::Murmur::InvalidTextureException', InvalidTextureException, ::Murmur::T_MurmurException, [])
|
@@ -835,10 +820,6 @@ module Murmur
|
|
835
820
|
def to_s
|
836
821
|
'Murmur::InvalidCallbackException'
|
837
822
|
end
|
838
|
-
|
839
|
-
def inspect
|
840
|
-
return ::Ice::__stringifyException(self)
|
841
|
-
end
|
842
823
|
end
|
843
824
|
|
844
825
|
T_InvalidCallbackException = ::Ice::__defineException('::Murmur::InvalidCallbackException', InvalidCallbackException, ::Murmur::T_MurmurException, [])
|
@@ -853,10 +834,6 @@ module Murmur
|
|
853
834
|
def to_s
|
854
835
|
'Murmur::InvalidSecretException'
|
855
836
|
end
|
856
|
-
|
857
|
-
def inspect
|
858
|
-
return ::Ice::__stringifyException(self)
|
859
|
-
end
|
860
837
|
end
|
861
838
|
|
862
839
|
T_InvalidSecretException = ::Ice::__defineException('::Murmur::InvalidSecretException', InvalidSecretException, ::Murmur::T_MurmurException, [])
|
@@ -1216,6 +1193,7 @@ module Murmur
|
|
1216
1193
|
# def setConf(key, value, current=nil)
|
1217
1194
|
# def setSuperuserPassword(pw, current=nil)
|
1218
1195
|
# def getLog(first, last, current=nil)
|
1196
|
+
# def getLogLen(current=nil)
|
1219
1197
|
# def getUsers(current=nil)
|
1220
1198
|
# def getChannels(current=nil)
|
1221
1199
|
# def getCertificateList(session, current=nil)
|
@@ -1316,6 +1294,10 @@ module Murmur
|
|
1316
1294
|
Server_mixin::OP_getLog.invoke(self, [first, last], _ctx)
|
1317
1295
|
end
|
1318
1296
|
|
1297
|
+
def getLogLen(_ctx=nil)
|
1298
|
+
Server_mixin::OP_getLogLen.invoke(self, [], _ctx)
|
1299
|
+
end
|
1300
|
+
|
1319
1301
|
def getUsers(_ctx=nil)
|
1320
1302
|
Server_mixin::OP_getUsers.invoke(self, [], _ctx)
|
1321
1303
|
end
|
@@ -1475,53 +1457,54 @@ module Murmur
|
|
1475
1457
|
T_ServerPrx.defineProxy(ServerPrx, T_Server)
|
1476
1458
|
ServerPrx::ICE_TYPE = T_ServerPrx
|
1477
1459
|
|
1478
|
-
Server_mixin::OP_isRunning = ::Ice::__defineOperation('isRunning', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Ice::T_bool, [])
|
1479
|
-
Server_mixin::OP_start = ::Ice::__defineOperation('start', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_ServerFailureException])
|
1480
|
-
Server_mixin::OP_stop = ::Ice::__defineOperation('stop', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [], [], nil, [::Murmur::T_ServerBootedException])
|
1481
|
-
Server_mixin::OP_delete = ::Ice::__defineOperation('delete', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [], [], nil, [::Murmur::T_ServerBootedException])
|
1482
|
-
Server_mixin::OP_id = ::Ice::__defineOperation('id', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Ice::T_int, [])
|
1483
|
-
Server_mixin::OP_addCallback = ::Ice::__defineOperation('addCallback', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [::Murmur::T_ServerCallbackPrx], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidCallbackException])
|
1484
|
-
Server_mixin::OP_removeCallback = ::Ice::__defineOperation('removeCallback', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [::Murmur::T_ServerCallbackPrx], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidCallbackException])
|
1485
|
-
Server_mixin::OP_setAuthenticator = ::Ice::__defineOperation('setAuthenticator', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [::Murmur::T_ServerAuthenticatorPrx], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidCallbackException])
|
1486
|
-
Server_mixin::OP_getConf = ::Ice::__defineOperation('getConf', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_string], [], ::Ice::T_string, [])
|
1487
|
-
Server_mixin::OP_getAllConf = ::Ice::__defineOperation('getAllConf', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Murmur::T_ConfigMap, [])
|
1488
|
-
Server_mixin::OP_setConf = ::Ice::__defineOperation('setConf', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_string, ::Ice::T_string], [], nil, [])
|
1489
|
-
Server_mixin::OP_setSuperuserPassword = ::Ice::__defineOperation('setSuperuserPassword', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_string], [], nil, [])
|
1490
|
-
Server_mixin::OP_getLog = ::Ice::__defineOperation('getLog', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_int, ::Ice::T_int], [], ::Murmur::T_LogList, [])
|
1491
|
-
Server_mixin::
|
1492
|
-
Server_mixin::
|
1493
|
-
Server_mixin::
|
1494
|
-
Server_mixin::
|
1495
|
-
Server_mixin::
|
1496
|
-
Server_mixin::
|
1497
|
-
Server_mixin::
|
1498
|
-
Server_mixin::
|
1499
|
-
Server_mixin::
|
1500
|
-
Server_mixin::
|
1501
|
-
Server_mixin::
|
1502
|
-
Server_mixin::
|
1503
|
-
Server_mixin::
|
1504
|
-
Server_mixin::
|
1505
|
-
Server_mixin::
|
1506
|
-
Server_mixin::
|
1507
|
-
Server_mixin::
|
1508
|
-
Server_mixin::
|
1509
|
-
Server_mixin::
|
1510
|
-
Server_mixin::
|
1511
|
-
Server_mixin::
|
1512
|
-
Server_mixin::
|
1513
|
-
Server_mixin::
|
1514
|
-
Server_mixin::
|
1515
|
-
Server_mixin::
|
1516
|
-
Server_mixin::
|
1517
|
-
Server_mixin::
|
1518
|
-
Server_mixin::
|
1519
|
-
Server_mixin::
|
1520
|
-
Server_mixin::
|
1521
|
-
Server_mixin::
|
1522
|
-
Server_mixin::
|
1523
|
-
Server_mixin::
|
1524
|
-
Server_mixin::
|
1460
|
+
Server_mixin::OP_isRunning = ::Ice::__defineOperation('isRunning', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Ice::T_bool, [::Murmur::T_InvalidSecretException])
|
1461
|
+
Server_mixin::OP_start = ::Ice::__defineOperation('start', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_ServerFailureException, ::Murmur::T_InvalidSecretException])
|
1462
|
+
Server_mixin::OP_stop = ::Ice::__defineOperation('stop', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidSecretException])
|
1463
|
+
Server_mixin::OP_delete = ::Ice::__defineOperation('delete', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidSecretException])
|
1464
|
+
Server_mixin::OP_id = ::Ice::__defineOperation('id', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Ice::T_int, [::Murmur::T_InvalidSecretException])
|
1465
|
+
Server_mixin::OP_addCallback = ::Ice::__defineOperation('addCallback', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [::Murmur::T_ServerCallbackPrx], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidCallbackException, ::Murmur::T_InvalidSecretException])
|
1466
|
+
Server_mixin::OP_removeCallback = ::Ice::__defineOperation('removeCallback', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [::Murmur::T_ServerCallbackPrx], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidCallbackException, ::Murmur::T_InvalidSecretException])
|
1467
|
+
Server_mixin::OP_setAuthenticator = ::Ice::__defineOperation('setAuthenticator', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [::Murmur::T_ServerAuthenticatorPrx], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidCallbackException, ::Murmur::T_InvalidSecretException])
|
1468
|
+
Server_mixin::OP_getConf = ::Ice::__defineOperation('getConf', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_string], [], ::Ice::T_string, [::Murmur::T_InvalidSecretException])
|
1469
|
+
Server_mixin::OP_getAllConf = ::Ice::__defineOperation('getAllConf', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Murmur::T_ConfigMap, [::Murmur::T_InvalidSecretException])
|
1470
|
+
Server_mixin::OP_setConf = ::Ice::__defineOperation('setConf', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_string, ::Ice::T_string], [], nil, [::Murmur::T_InvalidSecretException])
|
1471
|
+
Server_mixin::OP_setSuperuserPassword = ::Ice::__defineOperation('setSuperuserPassword', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_string], [], nil, [::Murmur::T_InvalidSecretException])
|
1472
|
+
Server_mixin::OP_getLog = ::Ice::__defineOperation('getLog', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_int, ::Ice::T_int], [], ::Murmur::T_LogList, [::Murmur::T_InvalidSecretException])
|
1473
|
+
Server_mixin::OP_getLogLen = ::Ice::__defineOperation('getLogLen', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Ice::T_int, [::Murmur::T_InvalidSecretException])
|
1474
|
+
Server_mixin::OP_getUsers = ::Ice::__defineOperation('getUsers', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Murmur::T_UserMap, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidSecretException])
|
1475
|
+
Server_mixin::OP_getChannels = ::Ice::__defineOperation('getChannels', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Murmur::T_ChannelMap, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidSecretException])
|
1476
|
+
Server_mixin::OP_getCertificateList = ::Ice::__defineOperation('getCertificateList', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_int], [], ::Murmur::T_CertificateList, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidSessionException, ::Murmur::T_InvalidSecretException])
|
1477
|
+
Server_mixin::OP_getTree = ::Ice::__defineOperation('getTree', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Murmur::T_Tree, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidSecretException])
|
1478
|
+
Server_mixin::OP_getBans = ::Ice::__defineOperation('getBans', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Murmur::T_BanList, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidSecretException])
|
1479
|
+
Server_mixin::OP_setBans = ::Ice::__defineOperation('setBans', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Murmur::T_BanList], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidSecretException])
|
1480
|
+
Server_mixin::OP_kickUser = ::Ice::__defineOperation('kickUser', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [::Ice::T_int, ::Ice::T_string], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidSessionException, ::Murmur::T_InvalidSecretException])
|
1481
|
+
Server_mixin::OP_getState = ::Ice::__defineOperation('getState', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_int], [], ::Murmur::T_User, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidSessionException, ::Murmur::T_InvalidSecretException])
|
1482
|
+
Server_mixin::OP_setState = ::Ice::__defineOperation('setState', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Murmur::T_User], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidSessionException, ::Murmur::T_InvalidChannelException, ::Murmur::T_InvalidSecretException])
|
1483
|
+
Server_mixin::OP_sendMessage = ::Ice::__defineOperation('sendMessage', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [::Ice::T_int, ::Ice::T_string], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidSessionException, ::Murmur::T_InvalidSecretException])
|
1484
|
+
Server_mixin::OP_hasPermission = ::Ice::__defineOperation('hasPermission', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [::Ice::T_int, ::Ice::T_int, ::Ice::T_int], [], ::Ice::T_bool, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidSessionException, ::Murmur::T_InvalidChannelException, ::Murmur::T_InvalidSecretException])
|
1485
|
+
Server_mixin::OP_addContextCallback = ::Ice::__defineOperation('addContextCallback', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [::Ice::T_int, ::Ice::T_string, ::Ice::T_string, ::Murmur::T_ServerContextCallbackPrx, ::Ice::T_int], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidCallbackException, ::Murmur::T_InvalidSecretException])
|
1486
|
+
Server_mixin::OP_removeContextCallback = ::Ice::__defineOperation('removeContextCallback', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [::Murmur::T_ServerContextCallbackPrx], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidCallbackException, ::Murmur::T_InvalidSecretException])
|
1487
|
+
Server_mixin::OP_getChannelState = ::Ice::__defineOperation('getChannelState', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_int], [], ::Murmur::T_Channel, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidChannelException, ::Murmur::T_InvalidSecretException])
|
1488
|
+
Server_mixin::OP_setChannelState = ::Ice::__defineOperation('setChannelState', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Murmur::T_Channel], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidChannelException, ::Murmur::T_InvalidSecretException])
|
1489
|
+
Server_mixin::OP_removeChannel = ::Ice::__defineOperation('removeChannel', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [::Ice::T_int], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidChannelException, ::Murmur::T_InvalidSecretException])
|
1490
|
+
Server_mixin::OP_addChannel = ::Ice::__defineOperation('addChannel', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [::Ice::T_string, ::Ice::T_int], [], ::Ice::T_int, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidChannelException, ::Murmur::T_InvalidSecretException])
|
1491
|
+
Server_mixin::OP_sendMessageChannel = ::Ice::__defineOperation('sendMessageChannel', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [::Ice::T_int, ::Ice::T_bool, ::Ice::T_string], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidChannelException, ::Murmur::T_InvalidSecretException])
|
1492
|
+
Server_mixin::OP_getACL = ::Ice::__defineOperation('getACL', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_int], [::Murmur::T_ACLList, ::Murmur::T_GroupList, ::Ice::T_bool], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidChannelException, ::Murmur::T_InvalidSecretException])
|
1493
|
+
Server_mixin::OP_setACL = ::Ice::__defineOperation('setACL', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_int, ::Murmur::T_ACLList, ::Murmur::T_GroupList, ::Ice::T_bool], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidChannelException, ::Murmur::T_InvalidSecretException])
|
1494
|
+
Server_mixin::OP_addUserToGroup = ::Ice::__defineOperation('addUserToGroup', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_int, ::Ice::T_int, ::Ice::T_string], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidChannelException, ::Murmur::T_InvalidSessionException, ::Murmur::T_InvalidSecretException])
|
1495
|
+
Server_mixin::OP_removeUserFromGroup = ::Ice::__defineOperation('removeUserFromGroup', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_int, ::Ice::T_int, ::Ice::T_string], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidChannelException, ::Murmur::T_InvalidSessionException, ::Murmur::T_InvalidSecretException])
|
1496
|
+
Server_mixin::OP_redirectWhisperGroup = ::Ice::__defineOperation('redirectWhisperGroup', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_int, ::Ice::T_string, ::Ice::T_string], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidSessionException, ::Murmur::T_InvalidSecretException])
|
1497
|
+
Server_mixin::OP_getUserNames = ::Ice::__defineOperation('getUserNames', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Murmur::T_IdList], [], ::Murmur::T_NameMap, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidSecretException])
|
1498
|
+
Server_mixin::OP_getUserIds = ::Ice::__defineOperation('getUserIds', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Murmur::T_NameList], [], ::Murmur::T_IdMap, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidSecretException])
|
1499
|
+
Server_mixin::OP_registerUser = ::Ice::__defineOperation('registerUser', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [::Murmur::T_UserInfoMap], [], ::Ice::T_int, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidUserException, ::Murmur::T_InvalidSecretException])
|
1500
|
+
Server_mixin::OP_unregisterUser = ::Ice::__defineOperation('unregisterUser', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [::Ice::T_int], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidUserException, ::Murmur::T_InvalidSecretException])
|
1501
|
+
Server_mixin::OP_updateRegistration = ::Ice::__defineOperation('updateRegistration', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_int, ::Murmur::T_UserInfoMap], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidUserException, ::Murmur::T_InvalidSecretException])
|
1502
|
+
Server_mixin::OP_getRegistration = ::Ice::__defineOperation('getRegistration', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_int], [], ::Murmur::T_UserInfoMap, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidUserException, ::Murmur::T_InvalidSecretException])
|
1503
|
+
Server_mixin::OP_getRegisteredUsers = ::Ice::__defineOperation('getRegisteredUsers', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_string], [], ::Murmur::T_NameMap, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidSecretException])
|
1504
|
+
Server_mixin::OP_verifyPassword = ::Ice::__defineOperation('verifyPassword', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_string, ::Ice::T_string], [], ::Ice::T_int, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidSecretException])
|
1505
|
+
Server_mixin::OP_getTexture = ::Ice::__defineOperation('getTexture', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_int], [], ::Murmur::T_Texture, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidUserException, ::Murmur::T_InvalidSecretException])
|
1506
|
+
Server_mixin::OP_setTexture = ::Ice::__defineOperation('setTexture', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_int, ::Murmur::T_Texture], [], nil, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidUserException, ::Murmur::T_InvalidTextureException, ::Murmur::T_InvalidSecretException])
|
1507
|
+
Server_mixin::OP_getUptime = ::Ice::__defineOperation('getUptime', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Ice::T_int, [::Murmur::T_ServerBootedException, ::Murmur::T_InvalidSecretException])
|
1525
1508
|
end
|
1526
1509
|
|
1527
1510
|
if not defined?(::Murmur::MetaCallback_mixin)
|
@@ -1618,6 +1601,8 @@ module Murmur
|
|
1618
1601
|
# def addCallback(cb, current=nil)
|
1619
1602
|
# def removeCallback(cb, current=nil)
|
1620
1603
|
# def getUptime(current=nil)
|
1604
|
+
# def getSlice(current=nil)
|
1605
|
+
# def getSliceChecksums(current=nil)
|
1621
1606
|
|
1622
1607
|
def inspect
|
1623
1608
|
::Ice::__stringify(self, T_Meta)
|
@@ -1667,6 +1652,14 @@ module Murmur
|
|
1667
1652
|
def getUptime(_ctx=nil)
|
1668
1653
|
Meta_mixin::OP_getUptime.invoke(self, [], _ctx)
|
1669
1654
|
end
|
1655
|
+
|
1656
|
+
def getSlice(_ctx=nil)
|
1657
|
+
Meta_mixin::OP_getSlice.invoke(self, [], _ctx)
|
1658
|
+
end
|
1659
|
+
|
1660
|
+
def getSliceChecksums(_ctx=nil)
|
1661
|
+
Meta_mixin::OP_getSliceChecksums.invoke(self, [], _ctx)
|
1662
|
+
end
|
1670
1663
|
end
|
1671
1664
|
class MetaPrx < ::Ice::ObjectPrx
|
1672
1665
|
include MetaPrx_mixin
|
@@ -1691,14 +1684,16 @@ module Murmur
|
|
1691
1684
|
T_MetaPrx.defineProxy(MetaPrx, T_Meta)
|
1692
1685
|
MetaPrx::ICE_TYPE = T_MetaPrx
|
1693
1686
|
|
1694
|
-
Meta_mixin::OP_getServer = ::Ice::__defineOperation('getServer', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_int], [], ::Murmur::T_ServerPrx, [])
|
1695
|
-
Meta_mixin::OP_newServer = ::Ice::__defineOperation('newServer', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [], [], ::Murmur::T_ServerPrx, [])
|
1696
|
-
Meta_mixin::OP_getBootedServers = ::Ice::__defineOperation('getBootedServers', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Murmur::T_ServerList, [])
|
1697
|
-
Meta_mixin::OP_getAllServers = ::Ice::__defineOperation('getAllServers', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Murmur::T_ServerList, [])
|
1698
|
-
Meta_mixin::OP_getDefaultConf = ::Ice::__defineOperation('getDefaultConf', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Murmur::T_ConfigMap, [])
|
1687
|
+
Meta_mixin::OP_getServer = ::Ice::__defineOperation('getServer', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [::Ice::T_int], [], ::Murmur::T_ServerPrx, [::Murmur::T_InvalidSecretException])
|
1688
|
+
Meta_mixin::OP_newServer = ::Ice::__defineOperation('newServer', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [], [], ::Murmur::T_ServerPrx, [::Murmur::T_InvalidSecretException])
|
1689
|
+
Meta_mixin::OP_getBootedServers = ::Ice::__defineOperation('getBootedServers', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Murmur::T_ServerList, [::Murmur::T_InvalidSecretException])
|
1690
|
+
Meta_mixin::OP_getAllServers = ::Ice::__defineOperation('getAllServers', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Murmur::T_ServerList, [::Murmur::T_InvalidSecretException])
|
1691
|
+
Meta_mixin::OP_getDefaultConf = ::Ice::__defineOperation('getDefaultConf', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Murmur::T_ConfigMap, [::Murmur::T_InvalidSecretException])
|
1699
1692
|
Meta_mixin::OP_getVersion = ::Ice::__defineOperation('getVersion', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [::Ice::T_int, ::Ice::T_int, ::Ice::T_int, ::Ice::T_string], nil, [])
|
1700
|
-
Meta_mixin::OP_addCallback = ::Ice::__defineOperation('addCallback', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [::Murmur::T_MetaCallbackPrx], [], nil, [::Murmur::T_InvalidCallbackException])
|
1701
|
-
Meta_mixin::OP_removeCallback = ::Ice::__defineOperation('removeCallback', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [::Murmur::T_MetaCallbackPrx], [], nil, [::Murmur::T_InvalidCallbackException])
|
1693
|
+
Meta_mixin::OP_addCallback = ::Ice::__defineOperation('addCallback', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [::Murmur::T_MetaCallbackPrx], [], nil, [::Murmur::T_InvalidCallbackException, ::Murmur::T_InvalidSecretException])
|
1694
|
+
Meta_mixin::OP_removeCallback = ::Ice::__defineOperation('removeCallback', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, [::Murmur::T_MetaCallbackPrx], [], nil, [::Murmur::T_InvalidCallbackException, ::Murmur::T_InvalidSecretException])
|
1702
1695
|
Meta_mixin::OP_getUptime = ::Ice::__defineOperation('getUptime', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Ice::T_int, [])
|
1696
|
+
Meta_mixin::OP_getSlice = ::Ice::__defineOperation('getSlice', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Ice::T_string, [])
|
1697
|
+
Meta_mixin::OP_getSliceChecksums = ::Ice::__defineOperation('getSliceChecksums', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, true, [], [], ::Ice::T_SliceChecksumDict, [])
|
1703
1698
|
end
|
1704
1699
|
end
|
metadata
CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
|
|
5
5
|
segments:
|
6
6
|
- 0
|
7
7
|
- 0
|
8
|
-
-
|
9
|
-
version: 0.0.
|
8
|
+
- 4
|
9
|
+
version: 0.0.4
|
10
10
|
platform: ruby
|
11
11
|
authors:
|
12
12
|
- Brian Stolz
|
@@ -14,7 +14,7 @@ autorequire:
|
|
14
14
|
bindir: bin
|
15
15
|
cert_chain: []
|
16
16
|
|
17
|
-
date:
|
17
|
+
date: 2011-02-20 00:00:00 -08:00
|
18
18
|
default_executable:
|
19
19
|
dependencies:
|
20
20
|
- !ruby/object:Gem::Dependency
|