diff options
| author | Wim <wim@42.be> | 2017-02-17 22:12:53 +0100 |
|---|---|---|
| committer | Wim <wim@42.be> | 2017-02-17 22:12:53 +0100 |
| commit | 7558a2162e79ffa29b11881fe249ec836a8c8b3d (patch) | |
| tree | c64a7e3898d7ac9e49523ed9c0b2a4eaac492886 /bridge/xmpp | |
| parent | fe258e1b6752f2751d7aec742a4ee20a5594dcdb (diff) | |
| parent | 62b165c0b4052f96ab89c358301bf246d239eba7 (diff) | |
| download | matterbridge-msglm-7558a2162e79ffa29b11881fe249ec836a8c8b3d.tar.gz matterbridge-msglm-7558a2162e79ffa29b11881fe249ec836a8c8b3d.tar.bz2 matterbridge-msglm-7558a2162e79ffa29b11881fe249ec836a8c8b3d.zip | |
Merge branch 'status'
Diffstat (limited to 'bridge/xmpp')
| -rw-r--r-- | bridge/xmpp/xmpp.go | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/bridge/xmpp/xmpp.go b/bridge/xmpp/xmpp.go index 8899e718..4dcb8ef7 100644 --- a/bridge/xmpp/xmpp.go +++ b/bridge/xmpp/xmpp.go @@ -1,10 +1,10 @@ package bxmpp import ( + "crypto/tls" "github.com/42wim/matterbridge/bridge/config" log "github.com/Sirupsen/logrus" "github.com/mattn/go-xmpp" - "crypto/tls" "strings" "time" @@ -47,6 +47,10 @@ func (b *Bxmpp) Connect() error { return nil } +func (b *Bxmpp) Disconnect() error { + return nil +} + func (b *Bxmpp) JoinChannel(channel string) error { b.xc.JoinMUCNoHistory(channel+"@"+b.Config.Muc, b.Config.Nick) return nil @@ -63,11 +67,11 @@ func (b *Bxmpp) createXMPP() (*xmpp.Client, error) { tc.InsecureSkipVerify = b.Config.SkipTLSVerify tc.ServerName = strings.Split(b.Config.Server, ":")[0] options := xmpp.Options{ - Host: b.Config.Server, - User: b.Config.Jid, - Password: b.Config.Password, - NoTLS: true, - StartTLS: true, + Host: b.Config.Server, + User: b.Config.Jid, + Password: b.Config.Password, + NoTLS: true, + StartTLS: true, TLSConfig: tc, //StartTLS: false, |