Module: sip-router Branch: mariusbucur/conference Commit: 7a825107330dcd47ed2b94c5a734cedcbd2c869e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7a82510… Author: mariusbucur &lt;marius(a)marius-bucur.ro&gt; Committer: mariusbucur &lt;marius(a)marius-bucur.ro&gt; Date: Mon Jul 26 10:52:56 2010 +0300 added copyright in file headers --- modules_k/presence_conference/add_events.c | 3 +- modules_k/presence_conference/notify_body.c | 1 + modules_k/presence_conference/pidf.c.old | 205 -------------------- .../presence_conference/presence_conference.c | 2 +- 4 files changed, 4 insertions(+), 207 deletions(-) diff --git a/modules_k/presence_conference/add_events.c b/modules_k/presence_conference/add_events.c index a425fce..6263c9c 100644 --- a/modules_k/presence_conference/add_events.c +++ b/modules_k/presence_conference/add_events.c @@ -1,6 +1,7 @@ /* * add "conference" event to presence module - mariusbucur - * + * + * Copyright (C) 2010 Marius Bucur * Copyright (C) 2007 Juha Heinanen * Copyright (C) 2008 Klaus Darilion, IPCom * diff --git a/modules_k/presence_conference/notify_body.c b/modules_k/presence_conference/notify_body.c index 7992973..5e41e49 100644 --- a/modules_k/presence_conference/notify_body.c +++ b/modules_k/presence_conference/notify_body.c @@ -1,6 +1,7 @@ /* * presence_conference module - mariusbucur * + * Copyright (C) 2010 Marius Bucur * Copyright (C) 2006 Voice Sistem S.R.L. * Copyright (C) 2008 Klaus Darilion, IPCom * diff --git a/modules_k/presence_conference/pidf.c.old b/modules_k/presence_conference/pidf.c.old deleted file mode 100644 index 04f15e9..0000000 --- a/modules_k/presence_conference/pidf.c.old +++ /dev/null @@ -1,205 +0,0 @@ -/* - * $Id: pidf.c 1953 2007-04-04 08:50:33Z anca_vamanu $ - * - * presence module - presence server implementation - * - * Copyright (C) 2006 Voice Sistem S.R.L. - * - * This file is part of Kamailio, a free SIP server. - * - * Kamailio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * Kamailio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * History: - * -------- - * 2007-04-14 initial version (anca) - */ - -/*! \file - * \brief Kamailio Presence_XML :: PIDF handling - * \ingroup presence_xml - */ - -/** - * make strptime available - * use 600 for 'Single UNIX Specification, Version 3' - * _XOPEN_SOURCE creates conflict in header definitions in Solaris - */ -#ifndef __OS_solaris - #define _XOPEN_SOURCE 600 /* glibc2 on linux, bsd */ - #define _BSD_SOURCE 1 /* needed on linux to "fix" the effect - of the above define on - features.h/unistd.h syscall() */ -#else - #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */ -#endif - -#include <time.h> - -#undef _XOPEN_SOURCE -#undef _XOPEN_SOURCE_EXTENDED - -#include <string.h> -#include <stdlib.h> -#include <libxml/parser.h> -#include "../../dprint.h" -#include "../../sr_module.h" -#include "pidf.h" - -xmlAttrPtr xmlNodeGetAttrByName(xmlNodePtr node, const char *name) -{ - xmlAttrPtr attr = node->properties; - while (attr) { - if (xmlStrcasecmp(attr->name, (unsigned char*)name) == 0) - return attr; - attr = attr->next; - } - return NULL; -} - -char *xmlNodeGetAttrContentByName(xmlNodePtr node, const char *name) -{ - xmlAttrPtr attr = xmlNodeGetAttrByName(node, name); - if (attr) - return (char*)xmlNodeGetContent(attr->children); - else - return NULL; -} - -xmlNodePtr xmlNodeGetChildByName(xmlNodePtr node, const char *name) -{ - xmlNodePtr cur = node->children; - while (cur) { - if (xmlStrcasecmp(cur->name, (unsigned char*)name) == 0) - return cur; - cur = cur->next; - } - return NULL; -} - -xmlNodePtr xmlNodeGetNodeByName(xmlNodePtr node, const char *name, const char *ns) -{ - xmlNodePtr cur = node; - if (xmlStrcasecmp(cur->name, (unsigned char*)name) == 0) { - if (!ns || (cur->ns && xmlStrcasecmp(cur->ns->prefix, - (unsigned char*)ns) == 0)) - return cur; - } - else - { - cur = node->children; - while(cur) - { - xmlNodePtr result = xmlNodeGetNodeByName(cur, name, ns); - if(result) - return result; - cur = cur->next; - } - } - return NULL; -} - -char *xmlNodeGetNodeContentByName(xmlNodePtr root, const char *name, - const char *ns) -{ - xmlNodePtr node = xmlNodeGetNodeByName(root, name, ns); - if (node) - return (char*)xmlNodeGetContent(node->children); - else - return NULL; -} - -xmlNodePtr xmlDocGetNodeByName(xmlDocPtr doc, const char *name, const char *ns) -{ - xmlNodePtr cur = doc->children; - return xmlNodeGetNodeByName(cur, name, ns); -} - -char *xmlDocGetNodeContentByName(xmlDocPtr doc, const char *name, - const char *ns) -{ - xmlNodePtr node = xmlDocGetNodeByName(doc, name, ns); - if (node) - return (char*)xmlNodeGetContent(node->children); - else - return NULL; -} - -time_t xml_parse_dateTime(char* xml_time_str) -{ - struct tm tm; - char * p; - int h, m; - char h1, h2, m1, m2; - int sign= 1; - signed int timezone_diff= 0; - - p= strptime(xml_time_str, "%F", &tm); - if(p== NULL) - { - printf("error: failed to parse time\n"); - return 0; - } - p++; - p= strptime(p, "%T", &tm); - if(p== NULL) - { - printf("error: failed to parse time\n"); - return 0; - } - - if(*p== '\0') - goto done; - - if(*p== '.') - { - p++; - /* read the fractionar part of the seconds*/ - while(*p!= '\0' && *p>= '0' && *p<= '9') - { - p++; - } - } - - if(*p== '\0') - goto done; - - - /* read time zone */ - - if(*p== 'Z') - { - goto done; - } - - if(*p== '+') - sign= -1; - - p++; - - if(sscanf(p, "%c%c:%c%c", &h1, &h2, &m1, &m2) < 0) { - printf("error: failed to parse time\n"); - return 0; - } - - h= (h1- '0')*10+ h2- '0'; - m= (m1- '0')*10+ m2- '0'; - - timezone_diff= sign* ((m+ h* 60)* 60); - -done: - return (mktime(&tm) + timezone_diff); -} - - diff --git a/modules_k/presence_conference/presence_conference.c b/modules_k/presence_conference/presence_conference.c index 8dd0fba..709fa81 100644 --- a/modules_k/presence_conference/presence_conference.c +++ b/modules_k/presence_conference/presence_conference.c @@ -1,7 +1,7 @@ /* * presence_conference module - Presence Handling of "conference" events (handling conference-info+xml doc) * - * mariusbucur + * Copyright (C) 2010 Marius Bucur * * This file is part of Kamailio, a free SIP server. *