sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

Merge commit '87c73f768c84613f07e704026f3b6eff9459cfd0' into dora

This commit is contained in:
Holger Hans Peter Freyther 2016-01-22 19:20:12 +01:00
parent b17f95d381 87c73f768c
commit 94a36866e7
3 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
meta-telephony/recipes-misc/sofia-sip/files/msg_parser.c.diff Normal file
View File

@ -0,0 +1,35 @@
--- sofia-sip-1.12.11+20110422.1.orig/libsofia-sip-ua/msg/msg_parser.c
+++ sofia-sip-1.12.11+20110422.1/libsofia-sip-ua/msg/msg_parser.c
@@ -2468,8 +2468,6 @@
msg_header_t **
msg_hclass_offset(msg_mclass_t const *mc, msg_pub_t const *mo, msg_hclass_t *hc)
{
- int i;
-
assert(mc && hc);
if (mc == NULL || hc == NULL)
@@ -2484,9 +2482,20 @@
}
else
/* Header has no name. */
- for (i = 0; i <= 6; i++)
- if (hc->hc_hash == mc->mc_request[i].hr_class->hc_hash)
- return (msg_header_t **)((char *)mo + mc->mc_request[i].hr_offset);
+ if (hc->hc_hash == mc->mc_request[0].hr_class->hc_hash)
+ return (msg_header_t **)((char *)mo + mc->mc_request[0].hr_offset);
+ else if (hc->hc_hash == mc->mc_status[0].hr_class->hc_hash)
+ return (msg_header_t **)((char *)mo + mc->mc_status[0].hr_offset);
+ else if (hc->hc_hash == mc->mc_separator[0].hr_class->hc_hash)
+ return (msg_header_t **)((char *)mo + mc->mc_separator[0].hr_offset);
+ else if (hc->hc_hash == mc->mc_payload[0].hr_class->hc_hash)
+ return (msg_header_t **)((char *)mo + mc->mc_payload[0].hr_offset);
+ else if (hc->hc_hash == mc->mc_unknown[0].hr_class->hc_hash)
+ return (msg_header_t **)((char *)mo + mc->mc_unknown[0].hr_offset);
+ else if (hc->hc_hash == mc->mc_error[0].hr_class->hc_hash)
+ return (msg_header_t **)((char *)mo + mc->mc_error[0].hr_offset);
+ else if (hc->hc_hash == mc->mc_multipart[0].hr_class->hc_hash)
+ return (msg_header_t **)((char *)mo + mc->mc_multipart[0].hr_offset);
return NULL;
}

5
meta-telephony/recipes-misc/sofia-sip/sofia-sip.inc
View File

@ -5,7 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=03068f550c635f6520e0f0252da412fc"
SECTION = "libs"
DEPENDS = "glib-2.0 openssl"
SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
SRC_URI = "\
${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \
file://msg_parser.c.diff \
"
inherit autotools pkgconfig

2
meta-telephony/recipes-osmocom/libosmocore/libosmocore_git.bb
View File

@ -2,7 +2,7 @@ require ${PN}.inc
S = "${WORKDIR}/git"
SRCREV = "70fcbda6dd733a503e9a046e01986d8bfc2e2bb2"
SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git"
SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1"
PV = "0.9.0+gitr${SRCPV}"
PR = "r0"