Michael Jerris 5e81b98eba 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

274 lines
6.4 KiB
C

/*
* 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
*
*/
/**@internal
* @file su_bm.c
* @brief Search with Boyer-Moore algorithm
*
* @author Pekka Pessi <Pekka.Pessi@nokia.com>
*
* @date Created: Mon Apr 11 16:35:16 2005 ppessi
*
*/
#include "config.h"
#include <sofia-sip/su_bm.h>
#include <sys/types.h>
#include <stddef.h>
#include <limits.h>
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
#ifndef TORTURELOG
#define TORTURELOG(x) (void)0
#endif
struct bw_fwd_table {
unsigned char table[UCHAR_MAX + 1];
};
/** Build forward skip table #bm_fwd_table_t for Boyer-Moore algorithm. */
static
bm_fwd_table_t *
bm_memmem_study0(char const *needle, size_t nlen, bm_fwd_table_t *fwd)
{
size_t i;
if (nlen >= UCHAR_MAX) {
needle += nlen - UCHAR_MAX;
nlen = UCHAR_MAX;
}
memset(&fwd->table, (unsigned char)nlen, sizeof fwd->table);
for (i = 0; i < nlen; i++) {
fwd->table[(unsigned short)needle[i]] = (unsigned char)(nlen - i - 1);
}
return fwd;
}
/** @defgroup su_bm Fast string searching with Boyer-Moore algorithm
*
* The Boyer-Moore algorithm is used to implement fast substring search. The
* algorithm has some overhead caused by filling a table. Substring search
* then requires at most 1 / substring-length less string comparisons. On
* modern desktop hardware, Boyer-Moore algorithm is seldom faster than the
* naive implementation if the searched substring is shorter than the cache
* line.
*
*/
/**@ingroup su_bm
* @typedef struct bw_fwd_table bm_fwd_table_t;
*
* Forward skip table for Boyer-Moore algorithm.
*
*/
/** Build case-sensitive forward skip table #bm_fwd_table_t
* for Boyer-Moore algorithm.
* @ingroup su_bm
*/
bm_fwd_table_t *
bm_memmem_study(char const *needle, size_t nlen)
{
bm_fwd_table_t *fwd = malloc(sizeof *fwd);
if (fwd)
bm_memmem_study0(needle, nlen, fwd);
return fwd;
}
/** Search for a substring using Boyer-Moore algorithm.
* @ingroup su_bm
*/
char *
bm_memmem(char const *haystack, size_t hlen,
char const *needle, size_t nlen,
bm_fwd_table_t *fwd)
{
size_t i, j;
bm_fwd_table_t fwd0[1];
if (nlen == 0)
return (char *)haystack;
if (needle == NULL || haystack == NULL || nlen > hlen)
return NULL;
if (nlen == 1) {
for (i = 0; i < hlen; i++)
if (haystack[i] == needle[0])
return (char *)haystack + i;
return NULL;
}
if (!fwd)
fwd = bm_memmem_study0(needle, nlen, fwd0);
for (i = j = nlen - 1; i < hlen;) {
unsigned char h = haystack[i];
if (h == needle[j]) {
TORTURELOG(("match \"%s\" at %u\nwith %*s\"%.*s*%s\": %s\n",
haystack, (unsigned)i,
(int)(i - j), "", (int)j, needle, needle + j + 1,
j == 0 ? "match!" : "back by 1"));
if (j == 0)
return (char *)haystack + i;
i--, j--;
}
else {
if (fwd->table[h] > nlen - j) {
TORTURELOG(("match \"%s\" at %u\n"
"last %*s\"%.*s*%s\": (by %u)\n",
haystack, (unsigned)i,
(int)(i - j), "",
(int)j, needle, needle + j + 1, fwd->table[h]));
i += fwd->table[h];
}
else {
TORTURELOG(("match \"%s\" at %u\n"
"2nd %*s\"%.*s*%s\": (by %u)\n",
haystack, (unsigned)i,
(int)(i - j), "",
(int)j, needle, needle + j + 1, (unsigned)(nlen - j)));
i += nlen - j;
}
j = nlen - 1;
}
}
return NULL;
}
/** Build forward skip table for Boyer-Moore algorithm */
static
bm_fwd_table_t *
bm_memcasemem_study0(char const *needle, size_t nlen, bm_fwd_table_t *fwd)
{
size_t i;
if (nlen >= UCHAR_MAX) {
needle += nlen - UCHAR_MAX;
nlen = UCHAR_MAX;
}
for (i = 0; i < UCHAR_MAX; i++)
fwd->table[i] = (unsigned char)nlen;
for (i = 0; i < nlen; i++) {
unsigned char n = tolower(needle[i]);
fwd->table[n] = (unsigned char)(nlen - i - 1);
}
return fwd;
}
/** Build case-insensitive forward skip table for Boyer-Moore algorithm.
* @ingroup su_bm
*/
bm_fwd_table_t *
bm_memcasemem_study(char const *needle, size_t nlen)
{
bm_fwd_table_t *fwd = malloc(sizeof *fwd);
if (fwd)
bm_memcasemem_study0(needle, nlen, fwd);
return fwd;
}
/** Search for substring using Boyer-Moore algorithm.
* @ingroup su_bm
*/
char *
bm_memcasemem(char const *haystack, size_t hlen,
char const *needle, size_t nlen,
bm_fwd_table_t *fwd)
{
size_t i, j;
bm_fwd_table_t fwd0[1];
if (nlen == 0)
return (char *)haystack;
if (needle == 0 || haystack == 0 || nlen > hlen)
return NULL;
if (nlen == 1) {
for (i = 0; i < hlen; i++)
if (haystack[i] == needle[0])
return (char *)haystack + i;
return NULL;
}
if (!fwd) {
fwd = bm_memcasemem_study0(needle, nlen, fwd0);
}
for (i = j = nlen - 1; i < hlen;) {
unsigned char h = haystack[i], n = needle[j];
if (isupper(h))
h = tolower(h);
if (isupper(n))
n = tolower(n);
if (h == n) {
TORTURELOG(("match \"%s\" at %u\n"
"with %*s\"%.*s*%s\": %s\n",
haystack, (unsigned)i,
(int)(i - j), "", (int)j, needle, needle + j + 1,
j == 0 ? "match!" : "back by 1"));
if (j == 0)
return (char *)haystack + i;
i--, j--;
}
else {
if (fwd->table[h] > nlen - j) {
TORTURELOG(("match \"%s\" at %u\n"
"last %*s\"%.*s*%s\": (by %u)\n",
haystack, (unsigned)i,
(int)(i - j), "", (int)j, needle, needle + j + 1,
fwd->table[h]));
i += fwd->table[h];
}
else {
TORTURELOG(("match \"%s\" at %u\n"
"2nd %*s\"%.*s*%s\": (by %u)\n",
haystack, (unsigned)i,
(int)(i - j), "", (int)j, needle, needle + j + 1,
(unsigned)(nlen - j)));
i += nlen - j;
}
j = nlen - 1;
}
}
return NULL;
}