aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/ejabberd.hrl2
-rw-r--r--include/ejabberd_router.hrl6
-rw-r--r--include/mod_muc.hrl14
-rw-r--r--include/mod_muc_room.hrl7
4 files changed, 15 insertions, 14 deletions
diff --git a/include/ejabberd.hrl b/include/ejabberd.hrl
index f10d8d81e..419e91d0e 100644
--- a/include/ejabberd.hrl
+++ b/include/ejabberd.hrl
@@ -41,8 +41,6 @@
-define(COPYRIGHT, "Copyright (c) 2002-2017 ProcessOne").
--define(S2STIMEOUT, timer:minutes(10)).
-
%%-define(DBGFSM, true).
-record(scram,
diff --git a/include/ejabberd_router.hrl b/include/ejabberd_router.hrl
new file mode 100644
index 000000000..8de23c4c7
--- /dev/null
+++ b/include/ejabberd_router.hrl
@@ -0,0 +1,6 @@
+-type local_hint() :: undefined | integer() | {apply, atom(), atom()}.
+
+-record(route, {domain :: binary(),
+ server_host :: binary(),
+ pid :: undefined | pid(),
+ local_hint :: local_hint()}).
diff --git a/include/mod_muc.hrl b/include/mod_muc.hrl
index fd62436e0..ef66e2c2b 100644
--- a/include/mod_muc.hrl
+++ b/include/mod_muc.hrl
@@ -22,11 +22,15 @@
{'_', binary()},
opts = [] :: list() | '_'}).
--record(muc_online_room,
- {name_host = {<<"">>, <<"">>} :: {binary(), binary()} | '$1' |
- {'_', binary()} | '_',
- pid = self() :: pid() | '$2' | '_' | '$1'}).
-
-record(muc_registered,
{us_host = {{<<"">>, <<"">>}, <<"">>} :: {{binary(), binary()}, binary()} | '$1',
nick = <<"">> :: binary()}).
+
+-record(muc_online_room,
+ {name_host :: {binary(), binary()} | '$1' | {'_', binary()} | '_',
+ pid :: pid() | '$2' | '_' | '$1'}).
+
+-record(muc_online_users, {us :: {binary(), binary()},
+ resource :: binary() | '_',
+ room :: binary() | '_' | '$1',
+ host :: binary() | '_' | '$2'}).
diff --git a/include/mod_muc_room.hrl b/include/mod_muc_room.hrl
index 5c0b12e2a..010dc6e99 100644
--- a/include/mod_muc_room.hrl
+++ b/include/mod_muc_room.hrl
@@ -120,10 +120,3 @@
room_shaper = none :: shaper:shaper(),
room_queue = queue:new() :: ?TQUEUE
}).
-
--record(muc_online_users, {us = {<<>>, <<>>} :: {binary(), binary()},
- resource = <<>> :: binary() | '_',
- room = <<>> :: binary() | '_' | '$1',
- host = <<>> :: binary() | '_' | '$2'}).
-
--type muc_online_users() :: #muc_online_users{}.