Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
biboumi
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
88
Issues
88
List
Boards
Labels
Service Desk
Milestones
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
louiz’
biboumi
Commits
2117838c
Commit
2117838c
authored
Jun 19, 2014
by
louiz’
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Return a proper iq when the IRC server responds to our kick
A result or an error, depending on the type of message
parent
26ffc8fe
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
61 additions
and
5 deletions
+61
-5
src/bridge/bridge.cpp
src/bridge/bridge.cpp
+40
-2
src/bridge/bridge.hpp
src/bridge/bridge.hpp
+3
-1
src/xmpp/xmpp_component.cpp
src/xmpp/xmpp_component.cpp
+12
-1
src/xmpp/xmpp_component.hpp
src/xmpp/xmpp_component.hpp
+6
-1
No files found.
src/bridge/bridge.cpp
View file @
2117838c
...
...
@@ -216,11 +216,49 @@ void Bridge::send_irc_nick_change(const Iid& iid, const std::string& new_nick)
irc
->
send_nick_command
(
new_nick
);
}
void
Bridge
::
send_irc_kick
(
const
Iid
&
iid
,
const
std
::
string
&
target
,
const
std
::
string
&
reason
)
void
Bridge
::
send_irc_kick
(
const
Iid
&
iid
,
const
std
::
string
&
target
,
const
std
::
string
&
reason
,
const
std
::
string
&
iq_id
,
const
std
::
string
&
to_jid
)
{
IrcClient
*
irc
=
this
->
get_irc_client
(
iid
.
get_server
());
if
(
irc
)
irc
->
send_kick_command
(
iid
.
get_local
(),
target
,
reason
);
{
irc
->
send_kick_command
(
iid
.
get_local
(),
target
,
reason
);
this
->
add_waiting_iq
([
this
,
target
,
iq_id
,
to_jid
,
iid
](
const
std
::
string
&
irc_hostname
,
const
IrcMessage
&
message
){
if
(
irc_hostname
!=
iid
.
get_server
())
return
false
;
if
(
message
.
command
==
"KICK"
&&
message
.
arguments
.
size
()
>=
2
)
{
const
std
::
string
target_later
=
message
.
arguments
[
1
];
const
std
::
string
chan_name_later
=
utils
::
tolower
(
message
.
arguments
[
0
]);
if
(
target_later
!=
target
||
chan_name_later
!=
iid
.
get_local
())
return
false
;
this
->
xmpp
->
send_iq_result
(
iq_id
,
to_jid
,
std
::
to_string
(
iid
));
}
else
if
(
message
.
command
==
"401"
&&
message
.
arguments
.
size
()
>=
2
)
{
const
std
::
string
target_later
=
message
.
arguments
[
1
];
if
(
target_later
!=
target
)
return
false
;
std
::
string
error_message
=
"No such nick"
;
if
(
message
.
arguments
.
size
()
>=
3
)
error_message
=
message
.
arguments
[
2
];
this
->
xmpp
->
send_stanza_error
(
"iq"
,
to_jid
,
std
::
to_string
(
iid
),
iq_id
,
"cancel"
,
"item-not-found"
,
error_message
,
false
);
}
else
if
(
message
.
command
==
"482"
&&
message
.
arguments
.
size
()
>=
2
)
{
const
std
::
string
chan_name_later
=
utils
::
tolower
(
message
.
arguments
[
1
]);
if
(
chan_name_later
!=
iid
.
get_local
())
return
false
;
std
::
string
error_message
=
"You're not channel operator"
;
if
(
message
.
arguments
.
size
()
>=
3
)
error_message
=
message
.
arguments
[
2
];
this
->
xmpp
->
send_stanza_error
(
"iq"
,
to_jid
,
std
::
to_string
(
iid
),
iq_id
,
"cancel"
,
"not-allowed"
,
error_message
,
false
);
}
return
true
;
});
}
}
void
Bridge
::
set_channel_topic
(
const
Iid
&
iid
,
const
std
::
string
&
subject
)
...
...
src/bridge/bridge.hpp
View file @
2117838c
#ifndef BRIDGE_INCLUDED
# define BRIDGE_INCLUDED
#include <irc/irc_message.hpp>
#include <irc/irc_client.hpp>
#include <bridge/colors.hpp>
#include <irc/irc_user.hpp>
...
...
@@ -62,7 +63,8 @@ public:
void
send_private_message
(
const
Iid
&
iid
,
const
std
::
string
&
body
,
const
std
::
string
&
type
=
"PRIVMSG"
);
void
leave_irc_channel
(
Iid
&&
iid
,
std
::
string
&&
status_message
);
void
send_irc_nick_change
(
const
Iid
&
iid
,
const
std
::
string
&
new_nick
);
void
send_irc_kick
(
const
Iid
&
iid
,
const
std
::
string
&
target
,
const
std
::
string
&
reason
);
void
send_irc_kick
(
const
Iid
&
iid
,
const
std
::
string
&
target
,
const
std
::
string
&
reason
,
const
std
::
string
&
iq_id
,
const
std
::
string
&
to_jid
);
void
set_channel_topic
(
const
Iid
&
iid
,
const
std
::
string
&
subject
);
void
send_xmpp_version_to_irc
(
const
Iid
&
iid
,
const
std
::
string
&
name
,
const
std
::
string
&
version
,
const
std
::
string
&
os
);
...
...
src/xmpp/xmpp_component.cpp
View file @
2117838c
...
...
@@ -468,7 +468,7 @@ void XmppComponent::handle_iq(const Stanza& stanza)
if
(
reason_el
)
reason
=
reason_el
->
get_inner
();
Iid
iid
(
to
.
local
);
bridge
->
send_irc_kick
(
iid
,
nick
,
reason
);
bridge
->
send_irc_kick
(
iid
,
nick
,
reason
,
id
,
from
);
stanza_error
.
disable
();
}
}
...
...
@@ -1014,6 +1014,17 @@ void XmppComponent::send_iq_version_request(const std::string& from,
this
->
send_stanza
(
iq
);
}
void
XmppComponent
::
send_iq_result
(
const
std
::
string
&
id
,
const
std
::
string
&
to_jid
,
const
std
::
string
&
from_local_part
)
{
Stanza
iq
(
"iq"
);
iq
[
"from"
]
=
from_local_part
+
"@"
+
this
->
served_hostname
;
iq
[
"to"
]
=
to_jid
;
iq
[
"id"
]
=
id
;
iq
[
"type"
]
=
"result"
;
iq
.
close
();
this
->
send_stanza
(
iq
);
}
std
::
string
XmppComponent
::
next_id
()
{
char
uuid_str
[
37
];
...
...
src/xmpp/xmpp_component.hpp
View file @
2117838c
...
...
@@ -104,7 +104,8 @@ public:
*/
void
send_stanza_error
(
const
std
::
string
&
kind
,
const
std
::
string
&
to
,
const
std
::
string
&
from
,
const
std
::
string
&
id
,
const
std
::
string
&
error_type
,
const
std
::
string
&
defined_condition
,
const
std
::
string
&
text
);
const
std
::
string
&
defined_condition
,
const
std
::
string
&
text
,
const
bool
fulljid
=
true
);
/**
* Send the closing signal for our document (not closing the connection though).
*/
...
...
@@ -208,6 +209,10 @@ public:
*/
void
send_iq_version_request
(
const
std
::
string
&
from
,
const
std
::
string
&
jid_to
);
/**
* Send an empty iq of type result
*/
void
send_iq_result
(
const
std
::
string
&
id
,
const
std
::
string
&
to_jid
,
const
std
::
string
&
from
);
/**
* Handle the various stanza types
*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment