- integrated jabber messager (Eugene)

git-svn-id: svn://svn.zabbix.com/trunk@3835 97f52cf1-0a1b-0410-bd0e-c28be96e8082

1 files changed, 12 insertions, 1 deletions

diff --git a/src/zabbix_server/alerter/alerter.c b/src/zabbix_server/alerter/alerter.c
index c370c72b..f8358c19 100644
--- a/src/zabbix_server/alerter/alerter.c
+++ b/src/zabbix_server/alerter/alerter.c
@@ -51,6 +51,9 @@
 #include "zlog.h"
 #include "email.h"
 #include "sms.h"
+#if defined (HAVE_JABBER)
+#	include "jabber.h"
+#endif
 #include "daemon.h"
 
 #include "alerter.h"
@@ -94,6 +97,12 @@ static int execute_action(DB_ALERT *alert,DB_MEDIATYPE *mediatype, char *error,
 		res = send_email(mediatype->smtp_server,mediatype->smtp_helo,mediatype->smtp_email,alert->sendto,alert->subject,
 			alert->message, error, max_error_len);
 	}
+#if defined (HAVE_JABBER)
+	else if(mediatype->type==ALERT_TYPE_JABBER)
+	{
+		res = send_jabber(mediatype->username, mediatype->passwd, alert->sendto, alert->message, error, max_error_len);
+	}
+#endif /* HAVE_JABBER */
 	else if(mediatype->type==ALERT_TYPE_SMS)
 	{
 		res = send_sms(mediatype->gsm_modem,alert->sendto,alert->message, error, max_error_len);
@@ -197,7 +206,7 @@ int main_alerter_loop()
 		now  = time(NULL);
 
 /*		zbx_snprintf(sql,sizeof(sql),"select a.alertid,a.mediatypeid,a.sendto,a.subject,a.message,a.status,a.retries,mt.mediatypeid,mt.type,mt.description,mt.smtp_server,mt.smtp_helo,mt.smtp_email,mt.exec_path from alerts a,media_type mt where a.status=0 and a.retries<3 and a.mediatypeid=mt.mediatypeid order by a.clock"); */
-		result = DBselect("select a.alertid,a.mediatypeid,a.sendto,a.subject,a.message,a.status,a.retries,mt.mediatypeid,mt.type,mt.description,mt.smtp_server,mt.smtp_helo,mt.smtp_email,mt.exec_path,a.delay,mt.gsm_modem from alerts a,media_type mt where a.status=%d and a.retries<3 and (a.repeats<a.maxrepeats or a.maxrepeats=0) and a.nextcheck<=%d and a.mediatypeid=mt.mediatypeid and " ZBX_COND_NODEID " order by a.clock", ALERT_STATUS_NOT_SENT, now, LOCAL_NODE("mt.mediatypeid"));
+		result = DBselect("select a.alertid,a.mediatypeid,a.sendto,a.subject,a.message,a.status,a.retries,mt.mediatypeid,mt.type,mt.description,mt.smtp_server,mt.smtp_helo,mt.smtp_email,mt.exec_path,a.delay,mt.gsm_modem,mt.username,mt.passwd from alerts a,media_type mt where a.status=%d and a.retries<3 and (a.repeats<a.maxrepeats or a.maxrepeats=0) and a.nextcheck<=%d and a.mediatypeid=mt.mediatypeid and " ZBX_COND_NODEID " order by a.clock", ALERT_STATUS_NOT_SENT, now, LOCAL_NODE("mt.mediatypeid"));
 
 		while((row=DBfetch(result)))
 		{
@@ -220,6 +229,8 @@ int main_alerter_loop()
 			alert.delay=atoi(row[14]);
 
 			mediatype.gsm_modem=row[15];
+			mediatype.username=row[16];
+			mediatype.passwd=row[17];
 
 			phan.sa_handler = child_signal_handler;
 			sigemptyset(&phan.sa_mask);