2006-12-21 06:30:28 +00:00
|
|
|
/*
|
|
|
|
* This file is part of the Sofia-SIP package
|
|
|
|
*
|
|
|
|
* Copyright (C) 2005 Nokia Corporation.
|
|
|
|
*
|
|
|
|
* Contact: Pekka Pessi <pekka.pessi@nokia.com>
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2.1 of
|
|
|
|
* the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library 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
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
|
|
|
|
* 02110-1301 USA
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
Sync to current darcs tree:
Mon Sep 17 14:50:04 EDT 2007 Pekka.Pessi@nokia.com
* sofia-sip/sip_util.h: updated documentation
Mon Sep 17 14:50:18 EDT 2007 Pekka.Pessi@nokia.com
* sofia-sip/tport_tag.h: updated documentation
Mon Sep 17 14:50:28 EDT 2007 Pekka.Pessi@nokia.com
* soa_tag.c: updated documentation
Wed Sep 19 12:50:01 EDT 2007 Pekka.Pessi@nokia.com
* msg: updated documentation
Wed Sep 19 13:29:50 EDT 2007 Pekka.Pessi@nokia.com
* url: updated documentation
Wed Sep 19 13:32:14 EDT 2007 Pekka.Pessi@nokia.com
* nth: updated documentation
Wed Sep 19 13:32:27 EDT 2007 Pekka.Pessi@nokia.com
* nea: updated documentation
Wed Sep 19 13:33:36 EDT 2007 Pekka.Pessi@nokia.com
* http: updated documentation
Wed Sep 19 13:36:58 EDT 2007 Pekka.Pessi@nokia.com
* bnf: updated documentation
Wed Sep 19 13:38:58 EDT 2007 Pekka.Pessi@nokia.com
* nua: updated nua_stack_init_handle() prototype
Wed Sep 19 18:45:56 EDT 2007 Pekka.Pessi@nokia.com
* sip: added sip_name_addr_xtra(), sip_name_addr_dup()
Wed Sep 19 19:00:19 EDT 2007 Pekka.Pessi@nokia.com
* sip_basic.c: cleaned old crud
Thu Sep 20 13:34:04 EDT 2007 Pekka.Pessi@nokia.com
* iptsec: updated documentation
Thu Sep 20 13:36:22 EDT 2007 Pekka.Pessi@nokia.com
* tport: updated documentation
Thu Sep 20 13:36:56 EDT 2007 Pekka.Pessi@nokia.com
* su: updated documentation
Removed internal files from doxygen-generated documentation.
Thu Sep 20 13:38:29 EDT 2007 Pekka.Pessi@nokia.com
* soa: fixed documentation
Thu Sep 20 13:39:56 EDT 2007 Pekka.Pessi@nokia.com
* sdp: updated documentation
Thu Sep 20 13:40:16 EDT 2007 Pekka.Pessi@nokia.com
* ipt: updated documentation
Thu Sep 20 14:24:20 EDT 2007 Pekka.Pessi@nokia.com
* nta: updated documentation
Thu Sep 20 14:41:04 EDT 2007 Pekka.Pessi@nokia.com
* nua: updated documentation
Updated tag documentation.
Moved doxygen doc entries from sofia-sip/nua_tag.h to nua_tag.c.
Removed internal datatypes and files from the generated documents.
Wed Sep 19 13:34:20 EDT 2007 Pekka.Pessi@nokia.com
* docs: updated the generation of documentation. Updated links to header files.
Thu Sep 20 08:45:32 EDT 2007 Pekka.Pessi@nokia.com
* sip/Makefile.am: added tags to <sofia-sip/sip_extra.h>
Added check for extra tags in torture_sip.c.
Thu Sep 20 14:45:22 EDT 2007 Pekka.Pessi@nokia.com
* stun: updated documentation
Wed Jul 4 18:55:20 EDT 2007 Pekka.Pessi@nokia.com
* torture_heap.c: added tests for ##sort() and su_smoothsort()
Wed Jul 4 18:56:59 EDT 2007 Pekka.Pessi@nokia.com
* Makefile.am: added smoothsort.c
Fri Jul 13 12:38:44 EDT 2007 Pekka.Pessi@nokia.com
* sofia-sip/heap.h: heap_remove() now set()s index to 0 on removed item
Mon Jul 23 11:14:22 EDT 2007 Pekka.Pessi@nokia.com
* sofia-sip/heap.h: fixed bug in heap##remove()
If left kid was in heap but right was not, left kid was ignored.
Wed Jul 4 18:51:08 EDT 2007 Pekka.Pessi@nokia.com
* smoothsort.c: added
Wed Jul 4 18:51:34 EDT 2007 Pekka.Pessi@nokia.com
* heap.h: using su_smoothsort()
Fri Jul 6 10:20:27 EDT 2007 Pekka.Pessi@nokia.com
* smoothsort.c: added
Wed Sep 19 17:40:30 EDT 2007 Pekka.Pessi@nokia.com
* msg_parser.awk: generate two parser tables, default and extended
Wed Sep 19 18:39:45 EDT 2007 Pekka.Pessi@nokia.com
* msg_parser.awk: just generate list of extra headers
Allocate extended parser dynamically.
Wed Sep 19 18:59:59 EDT 2007 Pekka.Pessi@nokia.com
* sip: added Remote-Party-ID, P-Asserted-Identity, P-Preferred-Identity
Added functions sip_update_default_mclass() and sip_extend_mclass()
for handling the extended parser. Note that Reply-To and Alert-Info are only
available with the extended parser.
Wed Sep 19 19:05:44 EDT 2007 Pekka.Pessi@nokia.com
* RELEASE: updated
Thu Sep 20 13:38:59 EDT 2007 Pekka.Pessi@nokia.com
* sip: updated documentation
Thu Sep 20 14:17:28 EDT 2007 Pekka.Pessi@nokia.com
* docs/conformance.docs: updated
Mon Oct 1 10:11:14 EDT 2007 Pekka.Pessi@nokia.com
* tport_tag.c: re-enabled tptag_trusted
Thu Oct 4 09:21:07 EDT 2007 Pekka.Pessi@nokia.com
* su_osx_runloop.c: moved virtual function table after struct definition
Preparing for su_port_vtable_t refactoring.
Thu Oct 4 10:22:03 EDT 2007 Pekka.Pessi@nokia.com
* su_source.c: refactored initialization/deinitialization
Fri Oct 5 04:58:18 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com>
* sip_extra.c: fixed prototypes with isize_t
Fri Oct 5 04:58:45 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com>
* test_nta_api.c: removed warnings about signedness
Fri Oct 5 04:59:02 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com>
* test_nua_params.c: removed warnings about constness
Fri Oct 5 07:20:26 EDT 2007 Pekka Pessi <first.lastname@nokia.com>
* su_port.h, su_root.c: cleaned argument checking
The su_root_*() and su_port_*() functions now check their arguments once
and do not assert() with NULL arguments. The sur_task->sut_port should
always be valid while su_root_t is alive.
Fri Oct 5 07:22:09 EDT 2007 Pekka Pessi <first.lastname@nokia.com>
* su: added su_root_obtain(), su_root_release() and su_root_has_thread()
When root is created with su_root_create() or cloned with su_clone_start(),
the resulting root is obtained by the calling or created thread,
respectively.
The root can be released with su_root_release() and another thread can
obtain it.
The function su_root_has_thread() can be used to check if a thread has
obtained or released the root.
Implementation upgraded the su_port_own_thread() method as su_port_thread().
Fri Oct 5 07:28:10 EDT 2007 Pekka Pessi <first.lastname@nokia.com>
* su_port.h: removed su_port_threadsafe() and su_port_yield() methods
su_port_wait_events() replaces su_port_yield().
Fri Oct 5 13:26:04 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com>
* msg_parser.awk: not extending header structure unless needed.
Removed gawk-ish /* comments */.
Fri Oct 5 14:32:25 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com>
* run_test_su: removed GNUisms
Fri Oct 5 14:32:47 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com>
* Makefile.am: removed implicit check target test_urlmap
Fri Oct 5 14:22:32 EDT 2007 Pekka Pessi <first.lastname@nokia.com>
* torture_sresolv.c: use CLOCK_REALTIME if no CLOCK_PROCESS_CPUTIME_ID available
Casting timespec tv_sec to unsigned long.
Fri Oct * nua_s added handling nua_prack()
Thanks to Fabio Margarido for the patch.
Mon Oct 8 10:24:35 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: added test for sf.net bug #1803686
Mon Oct 8 08:15:23 EDT 2007 Pekka.Pessi@nokia.com
* RELEASE: updated.
Mon Oct 8 09:30:36 EDT 2007 Pekka.Pessi@nokia.com
* nua_stack: added handling nua_prack()
Thanks to Fabio Margarido for the patch.
Mon Oct 8 10:24:35 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: added test for sf.net bug #1803686
Mon Oct 8 10:26:31 EDT 2007 Pekka.Pessi@nokia.com
* nua: added test for nua_prack() (sf.net bug #1804248)
Avoid sending nua_i_state after nua_prack() if no SDP O/A is happening, too.
Mon Oct 8 10:32:04 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
* su_source.c: don t leak the wait arrays
Mon Oct 8 10:37:11 EDT 2007 Pekka.Pessi@nokia.com
* RELEASE: updated
Wed Oct 10 11:55:21 EDT 2007 Pekka.Pessi@nokia.com
* sip_parser.c: silenced warning about extra const in sip_extend_mclass()
Wed Oct 10 11:57:08 EDT 2007 Pekka.Pessi@nokia.com
* nta_tag.c: updated tag documentation
Wed Oct 10 13:16:40 EDT 2007 Pekka.Pessi@nokia.com
* nua: fix logging crash if outbound used with application contact
Silenced warnings.
Wed Oct 10 13:30:45 EDT 2007 Pekka.Pessi@nokia.com
* msg_parser.awk: removed extra "const"
Wed Oct 10 13:31:45 EDT 2007 Pekka.Pessi@nokia.com
* Makefile.am's: fixed distclean of documentation
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5840 d0543943-73ff-0310-b7d9-9358b9ac24b2
2007-10-11 14:16:59 +00:00
|
|
|
/**@internal
|
|
|
|
* @ingroup msg_parser
|
2006-12-21 06:30:28 +00:00
|
|
|
* @file msg_generic.c
|
|
|
|
* @brief Functions for generic headers
|
|
|
|
*
|
|
|
|
* @author Pekka Pessi <Pekka.Pessi@nokia.com>
|
|
|
|
*
|
|
|
|
* @date Created: Thu Jan 23 20:08:00 2003 ppessi
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|
|
|
|
#include <sofia-sip/su_alloc.h>
|
|
|
|
|
|
|
|
#include "sofia-sip/msg.h"
|
|
|
|
#include "sofia-sip/bnf.h"
|
|
|
|
#include "sofia-sip/msg_parser.h"
|
|
|
|
#include "sofia-sip/msg_header.h"
|
|
|
|
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <assert.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdarg.h>
|
|
|
|
#include <limits.h>
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Parse a generic header.
|
|
|
|
*
|
|
|
|
* The function msg_generic_d() parses a generic header structure.
|
|
|
|
*
|
|
|
|
* @param[in] home memory home
|
|
|
|
* @param[in,out] h header structure
|
|
|
|
* @param[in] s string to be parsed
|
|
|
|
* @param[in] slen length of the string
|
|
|
|
*
|
|
|
|
* @retval 0 when successful,
|
|
|
|
* @retval -1 upon an error.
|
|
|
|
*/
|
|
|
|
issize_t msg_generic_d(su_home_t *home,
|
|
|
|
msg_header_t *h,
|
|
|
|
char *s,
|
|
|
|
isize_t slen)
|
|
|
|
{
|
|
|
|
h->sh_generic->g_string = s;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Encode a generic header.
|
|
|
|
*
|
|
|
|
* The function @c msg_generic_e encodes a generic header.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
issize_t msg_generic_e(char b[], isize_t bsiz, msg_header_t const *h, int flags)
|
|
|
|
{
|
|
|
|
msg_generic_t const *g = h->sh_generic;
|
|
|
|
size_t n = strlen(g->g_string);
|
|
|
|
|
|
|
|
if (bsiz > n)
|
|
|
|
strcpy(b, g->g_string);
|
|
|
|
|
|
|
|
return (issize_t)n;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Calculate the size of strings associated with a @c msg_generic_t object. */
|
|
|
|
isize_t msg_generic_dup_xtra(msg_header_t const *h, isize_t offset)
|
|
|
|
{
|
|
|
|
msg_generic_t const *g = h->sh_generic;
|
|
|
|
return offset + MSG_STRING_SIZE(g->g_string);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Duplicate one @c msg_generic_t object. */
|
|
|
|
char *msg_generic_dup_one(msg_header_t *dst,
|
|
|
|
msg_header_t const *src,
|
|
|
|
char *b,
|
|
|
|
isize_t xtra)
|
|
|
|
{
|
|
|
|
char *end = b + xtra;
|
|
|
|
MSG_STRING_DUP(b, dst->sh_generic->g_string, src->sh_generic->g_string);
|
|
|
|
assert(b <= end); (void)end;
|
|
|
|
return b;
|
|
|
|
}
|
|
|
|
|
|
|
|
issize_t msg_numeric_d(su_home_t *home,
|
|
|
|
msg_header_t *h,
|
|
|
|
char *s,
|
|
|
|
isize_t slen)
|
|
|
|
{
|
2007-09-19 16:24:40 +00:00
|
|
|
msg_numeric_t *x = (msg_numeric_t *)h;
|
2006-12-21 06:30:28 +00:00
|
|
|
uint32_t value = 0;
|
|
|
|
issize_t retval = msg_uint32_d(&s, &value);
|
|
|
|
|
2007-09-19 16:24:40 +00:00
|
|
|
assert(x->x_common->h_class->hc_size >= sizeof *x);
|
|
|
|
|
|
|
|
x->x_value = value;
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
if (*s)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
issize_t msg_numeric_e(char b[], isize_t bsiz, msg_header_t const *h, int flags)
|
|
|
|
{
|
2007-09-19 16:24:40 +00:00
|
|
|
msg_numeric_t *x = (msg_numeric_t *)h;
|
|
|
|
|
|
|
|
assert(x->x_common->h_class->hc_size >= sizeof *x);
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-09-19 16:24:40 +00:00
|
|
|
if (x->x_value > 0xffffffffU)
|
2006-12-21 06:30:28 +00:00
|
|
|
return -1;
|
|
|
|
|
2007-09-19 16:24:40 +00:00
|
|
|
return snprintf(b, bsiz, "%lu", x->x_value);
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* ====================================================================== */
|
|
|
|
/* Comma-separated list */
|
|
|
|
|
|
|
|
/** @typedef struct msg_list_s msg_list_t;
|
|
|
|
*
|
|
|
|
* Type for token list headers.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
issize_t msg_list_d(su_home_t *home, msg_header_t *h, char *s, isize_t slen)
|
|
|
|
{
|
|
|
|
return msg_commalist_d(home, &s, &h->sh_list->k_items, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
issize_t msg_list_e(char b[], isize_t bsiz, msg_header_t const *h, int flags)
|
|
|
|
{
|
|
|
|
int compact = MSG_IS_COMPACT(flags);
|
|
|
|
char *b0 = b, *end = b + bsiz;
|
|
|
|
|
|
|
|
MSG_COMMALIST_E(b, end, h->sh_list->k_items, compact);
|
|
|
|
MSG_TERM_E(b, end);
|
|
|
|
|
|
|
|
return b - b0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**@internal
|
|
|
|
* Extra size of a msg_auth_t object.
|
|
|
|
*
|
|
|
|
* This function calculates extra size required by a msg_auth_t object.
|
|
|
|
*
|
|
|
|
* @param a pointer to a msg_auth_t object
|
|
|
|
*
|
|
|
|
* @return
|
|
|
|
* Size of strings related to msg_auth_t object.
|
|
|
|
*/
|
|
|
|
isize_t msg_list_dup_xtra(msg_header_t const *h, isize_t offset)
|
|
|
|
{
|
|
|
|
MSG_PARAMS_SIZE(offset, h->sh_list->k_items);
|
|
|
|
return offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
char *msg_list_dup_one(msg_header_t *dst,
|
|
|
|
msg_header_t const *src,
|
|
|
|
char *b,
|
|
|
|
isize_t xtra)
|
|
|
|
{
|
|
|
|
char *end = b + xtra;
|
|
|
|
msg_param_t const ** items = (msg_param_t const **)&dst->sh_list->k_items;
|
|
|
|
|
|
|
|
b = msg_params_dup(items, src->sh_list->k_items, b, xtra);
|
|
|
|
|
|
|
|
assert(b <= end); (void)end;
|
|
|
|
|
|
|
|
return b;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Append a list of constant items to a list.
|
|
|
|
*
|
|
|
|
* @retval 0 when successful
|
|
|
|
* @retval -1 upon an error
|
|
|
|
*/
|
|
|
|
int msg_list_append_items(su_home_t *home,
|
|
|
|
msg_list_t *k,
|
|
|
|
msg_param_t const items[])
|
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
if (k == NULL) return -1;
|
|
|
|
if (items == NULL) return 0;
|
|
|
|
|
|
|
|
for (i = 0; items[i]; i++) {
|
|
|
|
if (msg_header_add_param(home, (msg_common_t *)k, items[i]) < 0)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Replace a list of constant items.
|
|
|
|
*
|
|
|
|
* @retval 0 when successful
|
|
|
|
* @retval -1 upon an error
|
|
|
|
*/
|
|
|
|
int msg_list_replace_items(su_home_t *home,
|
|
|
|
msg_list_t *k,
|
|
|
|
msg_param_t const items[])
|
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
if (k == NULL) return -1;
|
|
|
|
if (items == NULL) return 0;
|
|
|
|
|
|
|
|
for (i = 0; items[i]; i++) {
|
|
|
|
if (msg_header_replace_item(home, (msg_common_t *)k, items[i]) < 0)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|